Merge branch 'MDL-64093_master' of git://github.com/markn86/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 21 Feb 2019 08:46:54 +0000 (09:46 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 21 Feb 2019 08:46:54 +0000 (09:46 +0100)
1  2 
lib/db/upgrade.php
message/lib.php
version.php

@@@ -2719,14 -2719,13 +2719,22 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2019011801.03);
      }
  
 -    if ($oldversion < 2019020100.01) {
 +    if ($oldversion < 2019021500.01) {
 +        $insights = $DB->get_record('message_providers', ['component' => 'moodle', 'name' => 'insights']);
 +        if (!empty($insights)) {
 +            $insights->capability = null;
 +            $DB->update_record('message_providers', $insights);
 +        }
 +        upgrade_main_savepoint(true, 2019021500.01);
 +    }
 +
++    if ($oldversion < 2019021500.02) {
+         // Default 'off' for existing sites as this is the behaviour they had earlier.
+         set_config('messagingdefaultpressenter', false);
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2019020100.01);
++        upgrade_main_savepoint(true, 2019021500.02);
+     }
      return true;
  }
diff --cc message/lib.php
Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2019021500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2019020800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2019021500.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.