MDL-9056 Undefined property in lib/db/upgrade.php; merged from MOODLE_18_STABLE

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index af7b33d554dfbac4524750387eb5f9b7db0951bd..158bd408f66b034d662f149101cdf316a0334258 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -624,7 +624,7 @@ function xmldb_main_upgrade($oldversion=0) {
 
     if (!empty($CFG->rolesactive) && $result && $oldversion < 2007021401) {
     /// create default logged in user role if not present - upgrade rom 1.7.x
-        if (empty($CFG->defaultuserroleid) or $CFG->defaultuserroleid == $CFG->guestroleid) {
+        if (empty($CFG->defaultuserroleid) or empty($CFG->guestroleid) or $CFG->defaultuserroleid == $CFG->guestroleid) {
             if (!get_records('role', 'shortname', 'user')) {
                 $userroleid = create_role(addslashes(get_string('authenticateduser')), 'user',
                                           addslashes(get_string('authenticateduserdescription')), 'moodle/legacy:user');