Fix for bug 5190 and a warning

This commit is contained in:
moodler
2006-04-23 03:46:28 +00:00
parent ebbc59e575
commit 1f36f2dbc5
2 changed files with 7 additions and 10 deletions
+3 -4
View File
@@ -7,11 +7,10 @@ function authorize_upgrade($oldversion=0) {
$result = true;
if (!$tables = $db->MetaColumns($CFG->prefix . 'enrol_authorize')) {
$installfirst = true;
}
if ($oldversion == 0 || !empty($installfirst)) {
if ($oldversion == 0) {
modify_database("$CFG->dirroot/enrol/authorize/db/mysql.sql");
} else if (!in_array($CFG->prefix . 'enrol_authorize', $db->MetaTables('TABLES'))) {
modify_database("$CFG->dirroot/enrol/authorize/db/mysql.sql");
}
+4 -6
View File
@@ -7,12 +7,10 @@ function authorize_upgrade($oldversion=0) {
$result = true;
if (!$tables = $db->MetaColumns($CFG->prefix . 'enrol_authorize')) {
$installfirst = true;
}
if ($oldversion == 0 || !empty($installfirst)) {
modify_database("$CFG->dirroot/enrol/authorize/db/postgres7.sql");
if ($oldversion == 0) {
modify_database("$CFG->dirroot/enrol/authorize/db/mysql.sql");
} else if (!in_array($CFG->prefix . 'enrol_authorize', $db->MetaTables('TABLES'))) {
modify_database("$CFG->dirroot/enrol/authorize/db/mysql.sql");
}
if ($oldversion < 2005071601) {