Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-63333_master' of git://github.com/markn86/moodle
  • Loading branch information
David Monllao committed Sep 18, 2018
2 parents 58e529e + cbc3833 commit 0e5144f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 0 additions & 2 deletions admin/settings/subsystems.php
Expand Up @@ -21,8 +21,6 @@
0)
);

$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));

Expand Down
2 changes: 0 additions & 2 deletions lang/en/admin.php
Expand Up @@ -274,7 +274,6 @@
$string['configmaxevents'] = 'Events to Lookahead';
$string['configmessaging'] = 'If enabled, users can send messages to other users on the site.';
$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['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.';
$string['configminpassworddigits'] = 'Passwords must have at least these many digits.';
Expand Down Expand Up @@ -748,7 +747,6 @@
$string['mediapluginyoutube'] = 'Enable YouTube links filter';
$string['messaging'] = 'Enable messaging system';
$string['messagingallowemailoverride'] = 'Notification email override';
$string['messaginghidereadnotifications'] = 'Hide read notifications';
$string['messagingallusers'] = 'Allow messages from anyone on the site';
$string['messagingdeletereadnotificationsdelay'] = 'Delete read notifications';
$string['minpassworddigits'] = 'Digits';
Expand Down
8 changes: 8 additions & 0 deletions lib/db/upgrade.php
Expand Up @@ -2352,5 +2352,13 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018091400.01);
}

if ($oldversion < 2018091700.01) {
// Remove unused setting.
unset_config('messaginghidereadnotifications');

// Main savepoint reached.
upgrade_main_savepoint(true, 2018091700.01);
}

return true;
}
2 changes: 1 addition & 1 deletion version.php
Expand Up @@ -29,7 +29,7 @@

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

$version = 2018091400.01; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2018091700.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.

Expand Down

0 comments on commit 0e5144f

Please sign in to comment.