From 0d7e83c4e4f2b0cf1b4a870d3fbd4fc8a5a2752c Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Wed, 19 Feb 2014 09:35:57 +0800 Subject: [PATCH] MDL-44118 question engine: Fix bad merge conflict resolution Version numbers were out of order in upgrade file (my bad). --- lib/db/upgrade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index a65020d9f8a..9cd3df1de4b 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -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) {