From: skodak <skodak>
Date: Thu, 15 Mar 2007 22:43:07 +0000 (+0000)
Subject: MDL-8924 fixed  UPGRADE fails from 1.6.4+ to 1.8 Beta+; merged from MOODLE_18_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ee266f33e00ac431dec40df60afc3c8b87c416c7;p=moodle.git

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 8b03dcdc4a..d8b938cae9 100644
--- 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')) {