L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-44118 question engine: Fix bad merge conflict resolution

Browse Source 
Version numbers were out of order in upgrade file (my bad).
This commit is contained in:
Damyon Wiese
2014-02-19 09:35:57 +08:00
parent 6071a209fe
commit 0d7e83c4e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+4 -4
View File
@@ -3032,16 +3032,16 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2014021800.00);
}
if ($oldversion < 2014021300.01) {
if ($oldversion < 2014021900.01) {
// Force uninstall of deleted tool.
if (!file_exists("$CFG->dirroot/$CFG->admin/tool/qeupgradehelper")) {
// Remove all other associated config.
unset_all_config_for_plugin('tool_qeupgradehelper');
}
upgrade_main_savepoint(true, 2014021300.01);
upgrade_main_savepoint(true, 2014021900.01);
}
if ($oldversion < 2014021300.02) {
if ($oldversion < 2014021900.02) {
// Define table question_states to be dropped.
$table = new xmldb_table('question_states');
@@ -3052,7 +3052,7 @@ function xmldb_main_upgrade($oldversion) {
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2014021300.02);
upgrade_main_savepoint(true, 2014021900.02);
}
if ($oldversion < 2014021900.00) {