Skip to content
Browse files

MDL-32119 Fixed messy merge in upgrade code

  • Loading branch information...
1 parent 46bc0e2 commit 66dd3e5d2fdb6b36074ed4280e48f1d6b7e516c1 @samhemelryk samhemelryk committed
Showing with 3 additions and 8 deletions.
  1. +3 −8 lib/db/upgrade.php
View
11 lib/db/upgrade.php
@@ -891,15 +891,10 @@ function xmldb_main_upgrade($oldversion) {
$table = new xmldb_table('backup_ids');
// Conditionally launch drop table for backup_ids
- // Conditionally launch drop field deleted from course_completion_crit_compl
- if ($dbman->field_exists($table2, $field)) {
- $dbman->drop_field($table2, $field);
+ if ($dbman->table_exists($table)) {
+ $dbman->drop_table($table);
}
- // Drop unused table "course_completion_notify"
- $table = new xmldb_table('course_completion_notify');
-
- // Conditionally launch drop table course_completion_notify
// Main savepoint reached
upgrade_main_savepoint(true, 2012062500.02);
}
@@ -963,7 +958,7 @@ function xmldb_main_upgrade($oldversion) {
// Conditionally launch drop field deleted from course_completions
if ($dbman->field_exists($table, $field)) {
- $dbman->drop_field($table, $field);
+ $dbman->drop_field($table, $field);
}
$field = new xmldb_field('timenotified');

0 comments on commit 66dd3e5

Please sign in to comment.
Something went wrong with that request. Please try again.