mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64990_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-03-19 23:03:56 +01:00
commit a1c99c02cf
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/tool/usertours/classes/manager.php
View File

@ -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

7
admin/tool/usertours/db/upgrade.php
View File

@ -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;
}

2
admin/tool/usertours/version.php
View File

@ -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).