Skip to content

Commit

Permalink
MDL-44118 question engine: Fix bad merge conflict resolution
Browse files Browse the repository at this point in the history
Version numbers were out of order in upgrade file (my bad).
  • Loading branch information
Damyon Wiese committed Feb 19, 2014
1 parent 6071a20 commit 0d7e83c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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) {
Expand Down

0 comments on commit 0d7e83c

Please sign in to comment.