Set default enrolment plugin to manual if the previous default is not an interactive...

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 850a28d94de6cf78b559a1e6c03493e16b6d9fc0..af6c043d0a26785b9afcb2bfa2770ba95ef74a09 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1722,6 +1722,14 @@ function main_upgrade($oldversion=0) {
           ) TYPE=MyISAM COMMENT ='tag instance for blogs.';");
     }
 
+    if ($oldversion < 2006031400) {
+        require_once("$CFG->dirroot/enrol/enrol.class.php");
+        $defaultenrol = enrolment_factory::factory($CFG->enrol);
+        if (!method_exists($defaultenrol, 'print_entry')) {
+            set_config('enrol', 'manual');
+        }
+    }
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 94cf28c25c2fd7b244b25347f02bf9209df112ec..2cbdc8eb35f212103ceff0bee03b5becdf80a4bd 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1463,6 +1463,14 @@ function main_upgrade($oldversion=0) {
         );");
     }
 
+    if ($oldversion < 2006031400) {
+        require_once("$CFG->dirroot/enrol/enrol.class.php");
+        $defaultenrol = enrolment_factory::factory($CFG->enrol);
+        if (!method_exists($defaultenrol, 'print_entry')) {
+            set_config('enrol', 'manual');
+        }
+    }
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index d16c7b069105561bc13f031a6d2a8478ebb346ae..df40846dc998304bbca7c12e46b37a9f492c3033 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006031000;  // YYYYMMDD = date
+   $version = 2006031400;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.6 development';    // Human-friendly version name