MDL-8924 fixed UPGRADE fails from 1.6.4+ to 1.8 Beta+; merged from MOODLE_18_STABLE

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 8b03dcdc4af9a05cfc77fc426566b70f375fae86..d8b938cae97fc1442763aa55e75e36c7ccfc78f3 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -613,7 +613,7 @@ function xmldb_main_upgrade($oldversion=0) {
         }
     }
 
-    if ($result && $oldversion < 2007021401) {
+    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 (!get_records('role', 'shortname', 'user')) {