From 8ca99a92da01594a63578f70afa69e3550cc8c7b Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 6 Mar 2019 14:57:05 +0800 Subject: [PATCH] MDL-64990 tool_usertours: do not show messaging tour when disabled --- admin/tool/usertours/classes/manager.php | 9 +++++++-- admin/tool/usertours/db/upgrade.php | 7 +++++++ admin/tool/usertours/version.php | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/admin/tool/usertours/classes/manager.php b/admin/tool/usertours/classes/manager.php index 64955f20de6..f29f481aae3 100644 --- a/admin/tool/usertours/classes/manager.php +++ b/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 diff --git a/admin/tool/usertours/db/upgrade.php b/admin/tool/usertours/db/upgrade.php index a8582de28fb..47e499422ff 100644 --- a/admin/tool/usertours/db/upgrade.php +++ b/admin/tool/usertours/db/upgrade.php @@ -54,5 +54,12 @@ function xmldb_tool_usertours_upgrade($oldversion) { // Automatically generated Moodle v3.6.0 release upgrade line. // Put any upgrade step following this. + if ($oldversion < 2019030600) { + // Update the tours shipped with Moodle. + manager::update_shipped_tours(); + + upgrade_plugin_savepoint(true, 2019030600, 'tool', 'usertours'); + } + return true; } diff --git a/admin/tool/usertours/version.php b/admin/tool/usertours/version.php index 2f00da1370b..c678cb9ae11 100644 --- a/admin/tool/usertours/version.php +++ b/admin/tool/usertours/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2018120300; // The current module version (Date: YYYYMMDDXX). +$plugin->version = 2019030600; // 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). -- 2.43.0