[multienrol]Made upgrade script more intelligent about setting enrol_plugins_enabled

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f42d2c9df18f5f6e570833282239dd90214073f7..5663015eefd0480f59bf8f4e7aa6e461e9c6bac6 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1660,7 +1660,7 @@ function main_upgrade($oldversion=0) {
 
     if ($oldversion < 2006030900) {
         table_column('course','','enrol','varchar','20','','');
-        set_config('enrol_plugins_enabled', $CFG->enrol);
+        set_config('enrol_plugins_enabled', ($CFG->enrol == 'internal'?$CFG->enrol:'internal,' . $CFG->enrol));
         require_once("$CFG->dirroot/enrol/enrol.class.php");
         $defaultenrol = enrolment_factory::factory($CFG->enrol);
         if (!method_exists($defaultenrol, 'print_entry')) { // switch enrollable to off for all courses in this case

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 330496eb2befebb84ddee27bddeed66d3797b921..6d4ceacc1646465daf2b0606a215daa484d9d441 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1403,7 +1403,7 @@ function main_upgrade($oldversion=0) {
 
     if ($oldversion < 2006030900) {
         table_column('course','','enrol','varchar','20','','');
-        set_config('enrol_plugins_enabled', $CFG->enrol);
+        set_config('enrol_plugins_enabled', ($CFG->enrol == 'internal'?$CFG->enrol:'internal,' . $CFG->enrol));
         require_once("$CFG->dirroot/enrol/enrol.class.php");
         $defaultenrol = enrolment_factory::factory($CFG->enrol);
         if (!method_exists($defaultenrol, 'print_entry')) { // switch enrollable to off for all courses in this case