Skip to content

Commit 0e5144f

Browse files
author
David Monllao
committed
Merge branch 'MDL-63333_master' of git://github.com/markn86/moodle
2 parents 58e529e + cbc3833 commit 0e5144f

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
@@ -21,8 +21,6 @@
2121
0)
2222
);
2323

24-
$optionalsubsystems->add(new admin_setting_configcheckbox('messaginghidereadnotifications', new lang_string('messaginghidereadnotifications', 'admin'), new lang_string('configmessaginghidereadnotifications','admin'), 0));
25-
2624
$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'));
2725
$optionalsubsystems->add(new admin_setting_configselect('messagingdeletereadnotificationsdelay', new lang_string('messagingdeletereadnotificationsdelay', 'admin'), new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'), 604800, $options));
2826

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'] = 'If enabled, users can send messages to other users on the site.';
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['configmessagingallusers'] = 'If enabled, users can choose to allow anyone on the site to send them a message. Otherwise, users can choose to allow only their contacts or others in their courses to send them messages.';
280279
$string['configminpassworddigits'] = 'Passwords must have at least these many digits.';
@@ -748,7 +747,6 @@
748747
$string['mediapluginyoutube'] = 'Enable YouTube links filter';
749748
$string['messaging'] = 'Enable messaging system';
750749
$string['messagingallowemailoverride'] = 'Notification email override';
751-
$string['messaginghidereadnotifications'] = 'Hide read notifications';
752750
$string['messagingallusers'] = 'Allow messages from anyone on the site';
753751
$string['messagingdeletereadnotificationsdelay'] = 'Delete read notifications';
754752
$string['minpassworddigits'] = 'Digits';

lib/db/upgrade.php

+8
Original file line numberDiff line numberDiff line change
@@ -2352,5 +2352,13 @@ function xmldb_main_upgrade($oldversion) {
23522352
upgrade_main_savepoint(true, 2018091400.01);
23532353
}
23542354

2355+
if ($oldversion < 2018091700.01) {
2356+
// Remove unused setting.
2357+
unset_config('messaginghidereadnotifications');
2358+
2359+
// Main savepoint reached.
2360+
upgrade_main_savepoint(true, 2018091700.01);
2361+
}
2362+
23552363
return true;
23562364
}

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 = 2018091400.01; // YYYYMMDD = weekly release date of this DEV branch.
32+
$version = 2018091700.01; // YYYYMMDD = weekly release date of this DEV branch.
3333
// RR = release increments - 00 in DEV branches.
3434
// .XX = incremental changes.
3535

0 commit comments

Comments
 (0)