From ad1630ae866b97a159037721adc01b375aebd99d Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sun, 6 Jul 2008 23:46:25 +0000
Subject: [PATCH] MDL-13901 fixed upgrade from 1.6.x -> 1.8.x which was
 incorrectly setting "Default role for all users" to guest

---
 lib/accesslib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 69c6b5fbe8d..26d0bb53d31 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -205,14 +205,16 @@ function load_defaultuser_role($return=false) {
     }
 
     if (empty($CFG->defaultuserroleid)) {    // Let's set the default to the guest role
-        if ($role = get_guest_role()) {
-            set_config('defaultuserroleid', $role->id);
+        if (!$role = get_guest_role()) {
+            $defaultuserroleid = $role->id;
         } else {
             return false;
         }
+    } else {
+        $defaultuserroleid = $CFG->defaultuserroleid;
     }
 
-    $capabilities = get_role_caps($CFG->defaultuserroleid);
+    $capabilities = get_role_caps($defaultuserroleid);
 
     // fix the guest user heritage:
     // If the default role is a guest role, then don't copy legacy:guest,