Permalink
Browse files

Merge branch 'MDL-63333_35' of git://github.com/markn86/moodle into M…

…OODLE_35_STABLE
  • Loading branch information...
dmonllao committed Sep 18, 2018
2 parents 3135d3f + ff5ec88 commit 1d67ef4cc7bcce7f44480b3f00d5fd16665d0bd2
Showing with 9 additions and 5 deletions.
  1. +0 −2 admin/settings/subsystems.php
  2. +0 −2 lang/en/admin.php
  3. +8 −0 lib/db/upgrade.php
  4. +1 −1 version.php
@@ -15,8 +15,6 @@
$optionalsubsystems->add(new admin_setting_configcheckbox('messaging', new lang_string('messaging', 'admin'), new lang_string('configmessaging','admin'), 1));
$optionalsubsystems->add(new admin_setting_configcheckbox('messaginghidereadnotifications', new lang_string('messaginghidereadnotifications', 'admin'), new lang_string('configmessaginghidereadnotifications','admin'), 0));
$options = array(DAYSECS=>new lang_string('secondstotime86400'), WEEKSECS=>new lang_string('secondstotime604800'), 2620800=>new lang_string('nummonths', 'moodle', 1), 15724800=>new lang_string('nummonths', 'moodle', 6),0=>new lang_string('never'));
$optionalsubsystems->add(new admin_setting_configselect('messagingdeletereadnotificationsdelay', new lang_string('messagingdeletereadnotificationsdelay', 'admin'), new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'), 604800, $options));
@@ -274,7 +274,6 @@
$string['configmaxevents'] = 'Events to Lookahead';
$string['configmessaging'] = 'Should the messaging system between site users be enabled?';
$string['configmessagingallowemailoverride'] = 'Allow users to have email message notifications sent to an email address other than the email address in their profile';
$string['configmessaginghidereadnotifications'] = 'Hide read notifications of events like forum posts when viewing messaging history';
$string['configmessagingdeletereadnotificationsdelay'] = 'Read notifications can be deleted to save space. How long after a notification is read can it be deleted?';
$string['configminpassworddigits'] = 'Passwords must have at least these many digits.';
$string['configminpasswordlength'] = 'Passwords must be at least these many characters long.';
@@ -747,7 +746,6 @@
$string['mediapluginyoutube'] = 'Enable YouTube links filter';
$string['messaging'] = 'Enable messaging system';
$string['messagingallowemailoverride'] = 'Notification email override';
$string['messaginghidereadnotifications'] = 'Hide read notifications';
$string['messagingdeletereadnotificationsdelay'] = 'Delete read notifications';
$string['minpassworddigits'] = 'Digits';
$string['minpasswordlength'] = 'Password length';
@@ -2306,5 +2306,13 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018051701.10);
}
if ($oldversion < 2018051702.02) {
// Remove unused setting.
unset_config('messaginghidereadnotifications');
// Main savepoint reached.
upgrade_main_savepoint(true, 2018051702.02);
}
return true;
}
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2018051702.01; // 20180517 = branching date YYYYMMDD - do not modify!
$version = 2018051702.02; // 20180517 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.

0 comments on commit 1d67ef4

Please sign in to comment.