From fe074586b5c3c7dca16bb53528334ee6c75a4fed Mon Sep 17 00:00:00 2001 From: skodak Date: Sun, 6 Jul 2008 23:54:07 +0000 Subject: [PATCH] MDL-13901 guest can not be selected in "Default role for all users" in 1.9.x; merged from MOODLE_19_STABLE --- lib/db/upgrade.php | 8 ++++++++ version.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 904d1e2699..f004aaccb8 100644 --- 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 cb82146a16..b18118aad6 100644 --- 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 -- 2.39.5