Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Dan Poltawski 2016-04-04 09:01:46 +01:00
commit 9d6e3cb6c0
2 changed files with 2 additions and 2 deletions

View File

@ -94,7 +94,7 @@ $string['configcleanreadtime'] = 'The hour of the day to clean old posts from th
$string['configdigestmailtime'] = 'People who choose to have emails sent to them in digest form will be emailed the digest daily. This setting controls which time of day the daily mail will be sent (the next cron that runs after this hour will send it).';
$string['configdisplaymode'] = 'The default display mode for discussions if one isn\'t set.';
$string['configenablerssfeeds'] = 'This switch will enable the possibility of RSS feeds for all forums. You will still need to turn feeds on manually in the settings for each forum.';
$string['configenabletimedposts'] = 'Set to \'yes\' if you want to allow setting of display periods when posting a new forum discussion (Experimental as not yet fully tested)';
$string['configenabletimedposts'] = 'Set to \'yes\' if you want to allow setting of display periods when posting a new forum discussion.';
$string['configlongpost'] = 'Any post over this length (in characters not including HTML) is considered long. Posts displayed on the site front page, social format course pages, or user profiles are shortened to a natural break somewhere between the forum_shortpost and forum_longpost values.';
$string['configmanydiscussions'] = 'Maximum number of discussions shown in a forum per page';
$string['configmaxattachments'] = 'Default maximum number of attachments allowed per post.';

View File

@ -133,6 +133,6 @@ if ($ADMIN->fulltree) {
}
$settings->add(new admin_setting_configcheckbox('forum_enabletimedposts', get_string('timedposts', 'forum'),
get_string('configenabletimedposts', 'forum'), 0));
get_string('configenabletimedposts', 'forum'), 1));
}