mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-32119 Fixed messy merge in upgrade code

Browse Source
This commit is contained in:
Sam Hemelryk 2012-07-09 17:00:52 +12:00
parent 46bc0e2238
commit 66dd3e5d2f
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/db/upgrade.php
View File

@ -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');