Merged from MOODLE_15_STABLE. First time install detection.

diff --git a/enrol/authorize/db/postgres7.php b/enrol/authorize/db/postgres7.php
index 56afca73813ab05edbdcf11454862bb9f6036465..8ab86ca166beee3c7e527f7866b86c1b5843c7fd 100644 (file)
--- a/enrol/authorize/db/postgres7.php
+++ b/enrol/authorize/db/postgres7.php
@@ -8,13 +8,12 @@ function enrol_authorize_upgrade($oldversion=0) {
 
     $result = true;
 
-    if (!$tables = $db->MetaColumns($CFG->prefix . 'enrol_authorize')) {
-        $installfirst = true;
-    }
-
-    if ($oldversion == 0 || !empty($installfirst)) { // First time install
+    if ($oldversion == 0) {
+        $result = modify_database("$CFG->dirroot/enrol/authorize/db/postgres7.sql");
+        return $result; // SQL file contains all upgrades.
+    } else if (!in_array($CFG->prefix . 'enrol_authorize', $db->MetaTables('TABLES'))) {
         $result = modify_database("$CFG->dirroot/enrol/authorize/db/postgres7.sql");
-        return $result; // RETURN, sql file contains last upgrades.
+        return $result; // SQL file contains all upgrades.
     }
 
     // Authorize module was installed before. Upgrades must be applied to SQL file.