MDL-13901 guest can not be selected in "Default role for all users" in 1.9.x; merged...

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 904d1e2699314f9f2eb750bda8fd231627f49179..f004aaccb86ede99f509d86c3b7a8aabc2ef7f51 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -192,6 +192,14 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2008070300);
     }
 
+    if ($result && $oldversion < 2008070700) {
+        if (isset($CFG->defaultuserroleid) and isset($CFG->guestroleid) and $CFG->defaultuserroleid == $CFG->guestroleid) {
+            // guest can not be selected in defaultuserroleid!
+            unset_config('defaultuserroleid');
+        }
+        upgrade_main_savepoint($result, 2008070700);
+    }
+
 /*
  * TODO:
  *   drop adodb_logsql table and create a new general sql log table

diff --git a/version.php b/version.php
index cb82146a16f53eaed31ac7a4d1801bc13595ac17..b18118aad631583c7ffce7ccdea0ac08cb602bd6 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 = 2008070500;  // YYYYMMDD   = date of the last version bump
+    $version = 2008070700;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20080706)';  // Human-friendly version name