diff --git a/lib/db/messages.php b/lib/db/messages.php index d3473bba7e4..3ae3810c3d4 100644 --- a/lib/db/messages.php +++ b/lib/db/messages.php @@ -121,7 +121,8 @@ $messageproviders = array ( // Message contact requests. 'messagecontactrequests' => [ 'defaults' => [ - 'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF, + // We don't need to notify in the popup output here because the message drawer + // already notifies users of contact requests. 'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDOFF, 'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF, ] diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 048ae58cb56..0998df7e91f 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3416,5 +3416,21 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2019070400.01); } + if ($oldversion < 2019071800.01) { + // Remove the "popup" processor from the list of default processors for the messagecontactrequests notification. + $oldloggedinconfig = get_config('message', 'message_provider_moodle_messagecontactrequests_loggedin'); + $oldloggedoffconfig = get_config('message', 'message_provider_moodle_messagecontactrequests_loggedoff'); + $newloggedinconfig = implode(',', array_filter(explode(',', $oldloggedinconfig), function($value) { + return $value != 'popup'; + })); + $newloggedoffconfig = implode(',', array_filter(explode(',', $oldloggedoffconfig), function($value) { + return $value != 'popup'; + })); + set_config('message_provider_moodle_messagecontactrequests_loggedin', $newloggedinconfig, 'message'); + set_config('message_provider_moodle_messagecontactrequests_loggedoff', $newloggedoffconfig, 'message'); + + upgrade_main_savepoint(true, 2019071800.01); + } + return true; } diff --git a/version.php b/version.php index 572c371c5b2..a3edfce2474 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2019071800.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2019071800.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes.