Merge branch 'MDL-65219-master' of https://github.com/ryanwyllie/moodle

diff --cc lib/db/upgrade.php
index 17190d3,0998df7..1833f1c
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -3416,20 -3416,21 +3416,36 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2019070400.01);
      }
  
 -    if ($oldversion < 2019071800.01) {
 +    if ($oldversion < 2019072200.00) {
 +
 +        // Define field relativedatesmode to be added to course.
 +        $table = new xmldb_table('course');
 +        $field = new xmldb_field('relativedatesmode', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'enddate');
 +
 +        // Conditionally launch add field relativedatesmode.
 +        if (!$dbman->field_exists($table, $field)) {
 +            $dbman->add_field($table, $field);
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2019072200.00);
 +    }
 +
++    if ($oldversion < 2019072500.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);
++        upgrade_main_savepoint(true, 2019072500.01);
+     }
+ 
      return true;
  }

diff --cc message/amd/build/message_drawer.min.js
index 00f658e,1049c16..14cd5ae
Binary files differ

diff --cc message/amd/build/message_drawer.min.js.map
index 2c4b675,0000000..d867a5f
mode 100644,000000..100644
Binary files differ

diff --cc message/amd/build/message_drawer_view_contacts.min.js
index 777c6e1,904728d..67936f6
Binary files differ

diff --cc message/amd/build/message_drawer_view_contacts.min.js.map
index 1708a48,0000000..7aa57bd
mode 100644,000000..100644
Binary files differ

diff --cc version.php
index d3b5604,a3edfce..105d8d4
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2019072500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2019071800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2019072500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.