Merge branch 'MDL-64990_36' of git://github.com/markn86/moodle into MOODLE_36_STABLE

admin/tool/usertours/classes/manager.php

@@ -796,8 +796,7 @@ class manager {
         // the format filename => version. The version value needs to
         // be increased if the tour has been updated.
         $shippedtours = [
-            '36_dashboard.json' => 3,
-            '36_messaging.json' => 3,
+            '36_dashboard.json' => 3
         ];
 
         // These are tours that we used to ship but don't ship any longer.
@@ -807,6 +806,12 @@ class manager {
             'boost_course_view.json' => 1,
         ];
 
+        if ($CFG->messaging) {
+            $shippedtours['36_messaging.json'] = 3;
+        } else {
+            $unshippedtours['36_messaging.json'] = 3;
+        }
+
         $existingtourrecords = $DB->get_recordset('tool_usertours_tours');
 
         // Get all of the existing shipped tours and check if they need to be

admin/tool/usertours/db/upgrade.php

@@ -57,5 +57,12 @@ function xmldb_tool_usertours_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    if ($oldversion < 2018120301) {
+        // Update the tours shipped with Moodle.
+        manager::update_shipped_tours();
+
+        upgrade_plugin_savepoint(true, 2018120301, 'tool', 'usertours');
+    }
+
     return true;
 }

admin/tool/usertours/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2018120300;            // The current module version (Date: YYYYMMDDXX).
+$plugin->version   = 2018120301;            // The current module version (Date: YYYYMMDDXX).
 $plugin->requires  = 2018112800;            // Requires this Moodle version.
 $plugin->component = 'tool_usertours';      // Full name of the plugin (used for diagnostics).