Skip to content

Commit 1d67ef4

Browse files
author
David Monllao
committed
Merge branch 'MDL-63333_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE
2 parents 3135d3f + ff5ec88 commit 1d67ef4

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

admin/settings/subsystems.php

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
$optionalsubsystems->add(new admin_setting_configcheckbox('messaging', new lang_string('messaging', 'admin'), new lang_string('configmessaging','admin'), 1));
1717

18-
$optionalsubsystems->add(new admin_setting_configcheckbox('messaginghidereadnotifications', new lang_string('messaginghidereadnotifications', 'admin'), new lang_string('configmessaginghidereadnotifications','admin'), 0));
19-
2018
$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'));
2119
$optionalsubsystems->add(new admin_setting_configselect('messagingdeletereadnotificationsdelay', new lang_string('messagingdeletereadnotificationsdelay', 'admin'), new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'), 604800, $options));
2220

lang/en/admin.php

-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@
274274
$string['configmaxevents'] = 'Events to Lookahead';
275275
$string['configmessaging'] = 'Should the messaging system between site users be enabled?';
276276
$string['configmessagingallowemailoverride'] = 'Allow users to have email message notifications sent to an email address other than the email address in their profile';
277-
$string['configmessaginghidereadnotifications'] = 'Hide read notifications of events like forum posts when viewing messaging history';
278277
$string['configmessagingdeletereadnotificationsdelay'] = 'Read notifications can be deleted to save space. How long after a notification is read can it be deleted?';
279278
$string['configminpassworddigits'] = 'Passwords must have at least these many digits.';
280279
$string['configminpasswordlength'] = 'Passwords must be at least these many characters long.';
@@ -747,7 +746,6 @@
747746
$string['mediapluginyoutube'] = 'Enable YouTube links filter';
748747
$string['messaging'] = 'Enable messaging system';
749748
$string['messagingallowemailoverride'] = 'Notification email override';
750-
$string['messaginghidereadnotifications'] = 'Hide read notifications';
751749
$string['messagingdeletereadnotificationsdelay'] = 'Delete read notifications';
752750
$string['minpassworddigits'] = 'Digits';
753751
$string['minpasswordlength'] = 'Password length';

lib/db/upgrade.php

+8
Original file line numberDiff line numberDiff line change
@@ -2306,5 +2306,13 @@ function xmldb_main_upgrade($oldversion) {
23062306
upgrade_main_savepoint(true, 2018051701.10);
23072307
}
23082308

2309+
if ($oldversion < 2018051702.02) {
2310+
// Remove unused setting.
2311+
unset_config('messaginghidereadnotifications');
2312+
2313+
// Main savepoint reached.
2314+
upgrade_main_savepoint(true, 2018051702.02);
2315+
}
2316+
23092317
return true;
23102318
}

version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
defined('MOODLE_INTERNAL') || die();
3131

32-
$version = 2018051702.01; // 20180517 = branching date YYYYMMDD - do not modify!
32+
$version = 2018051702.02; // 20180517 = branching date YYYYMMDD - do not modify!
3333
// RR = release increments - 00 in DEV branches.
3434
// .XX = incremental changes.
3535

0 commit comments

Comments
 (0)