moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44948' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Marina Glancy 2014-04-08 11:13:43 +08:00
commit 593fc9d8d6
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/classes/plugin_manager.php
View file

@ -908,7 +908,7 @@ class core_plugin_manager {
$plugins = array( $plugins = array(
'qformat' => array('blackboard'), 'qformat' => array('blackboard'),
'enrol' => array('authorize'), 'enrol' => array('authorize'),
'tool' => array('bloglevelupgrade'), 'tool' => array('bloglevelupgrade', 'qeupgradehelper'),
'theme' => array('mymobile', 'afterburner', 'anomaly', 'arialist', 'binarius', 'boxxie', 'brick', 'formal_white', 'theme' => array('mymobile', 'afterburner', 'anomaly', 'arialist', 'binarius', 'boxxie', 'brick', 'formal_white',
'formfactor', 'fusion', 'leatherbound', 'magazine', 'nimble', 'nonzero', 'overlay', 'serenity', 'sky_high', 'formfactor', 'fusion', 'leatherbound', 'magazine', 'nimble', 'nonzero', 'overlay', 'serenity', 'sky_high',
'splash', 'standard', 'standardold'), 'splash', 'standard', 'standardold'),
@ -1129,7 +1129,7 @@ class core_plugin_manager {
'assignmentupgrade', 'behat', 'capability', 'customlang', 'assignmentupgrade', 'behat', 'capability', 'customlang',
'dbtransfer', 'generator', 'health', 'innodb', 'installaddon', 'dbtransfer', 'generator', 'health', 'innodb', 'installaddon',
'langimport', 'log', 'multilangupgrade', 'phpunit', 'profiling', 'langimport', 'log', 'multilangupgrade', 'phpunit', 'profiling',
'qeupgradehelper', 'replace', 'spamcleaner', 'task', 'timezoneimport', 'replace', 'spamcleaner', 'task', 'timezoneimport',
'unittest', 'uploadcourse', 'uploaduser', 'unsuproles', 'xmldb' 'unittest', 'uploadcourse', 'uploaduser', 'unsuproles', 'xmldb'
), ),

14
lib/db/upgrade.php
View file

@ -3033,10 +3033,16 @@ function xmldb_main_upgrade($oldversion) {
if ($oldversion < 2014021900.01) { if ($oldversion < 2014021900.01) {
// Force uninstall of deleted tool. // Force uninstall of deleted tool.
if (!file_exists("$CFG->dirroot/$CFG->admin/tool/qeupgradehelper")) {
// Remove all other associated config. // Normally, in this sort of situation, we would do a file_exists check,
unset_all_config_for_plugin('tool_qeupgradehelper'); // in case the plugin had been added back as an add-on. However, this
} // plugin is completely useless after Moodle 2.6, so we check that the
// files have been removed in upgrade_stale_php_files_present, and we
// uninstall it unconditionally here.
// Remove all associated config.
unset_all_config_for_plugin('tool_qeupgradehelper');
upgrade_main_savepoint(true, 2014021900.01); upgrade_main_savepoint(true, 2014021900.01);
} }