Merge branch 'w32_MDL-34600_m24_questionschema' of git://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2012-08-07 08:40:42 +08:00
commit deb89552b2
2 changed files with 15 additions and 1 deletions

View File

@ -1081,5 +1081,19 @@ function xmldb_main_upgrade($oldversion) {
// Main savepoint reached
upgrade_main_savepoint(true, 2012072600.01);
}
if ($oldversion < 2012080200.02) {
// Drop obsolete question upgrade field that should have been added to the install.xml.
$table = new xmldb_table('question');
$field = new xmldb_field('oldquestiontextformat', XMLDB_TYPE_INTEGER, '2', null, XMLDB_NOTNULL, null, '0');
if ($dbman->field_exists($table, $field)) {
$dbman->drop_field($table, $field);
}
upgrade_main_savepoint(true, 2012080200.02);
}
return true;
}

View File

@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012080200.01; // YYYYMMDD = weekly release date of this DEV branch
$version = 2012080200.02; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes