fix bug 6538, in which $db->MetaColumns was not defined in some PG sites

This commit is contained in:
gbateson
2006-09-13 21:25:58 +00:00
parent 2864912fe0
commit 0d3b042fec
+6 -11
View File
@@ -3,23 +3,18 @@ function hotpot_upgrade($oldversion) {
global $CFG;
$ok = true;
// set path to update functions
$update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
// if the version number indicates this could be an early HotPot v2.1 (Moodle 1.6),
// check this is not actually HotPot v2.0 (Moodle 1.5) with an overly advanced version number
if ($oldversion>2005031400 && $oldversion<=2006082899) {
$columns = $db->MetaColumns($CFG->prefix.'hotpot_attempts');
foreach ($columns as $column) {
if ($column->name=='details') {
// the "hotpot_attempts" table has a "details" field so this is actually HotPot v2.0
// reset the version number in order to trigger the correct order of updates
$oldversion = 2005031400;
break;
}
require_once $update_to_v2;
if (hotpot_db_field_exists('hotpot_attempts', 'details')) {
$oldversion = 2005031400;
}
}
// set path to update functions
$update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
// update from HotPot v1 to HotPot v2
if ($oldversion < 2005031400) {
require_once $update_to_v2;