From: skodak <skodak>
Date: Tue, 10 Jul 2007 07:46:19 +0000 (+0000)
Subject: do not use role functions in upgrade scripts if roles not setup yet
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8c6c185a1c85ab22ecc63f4f7a6c096f5213e8b5;p=moodle.git

do not use role functions in upgrade scripts if roles not setup yet
---

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index d86bb9b441..bb8a8570cf 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -122,7 +122,8 @@ function xmldb_main_upgrade($oldversion=0) {
         execute_sql("DELETE FROM {$CFG->prefix}config where name='secureforms'", true);
     }
     
-    if ($oldversion < 2006120700) { // add moodle/user:viewdetails to all roles!
+    if (!empty($CFG->rolesactive) && $oldversion < 2006120700) { // add moodle/user:viewdetails to all roles!
+        // note: use of assign_capability() is discouraged in upgrade script!
         if ($roles = get_records('role')) {
             $context = get_context_instance(CONTEXT_SYSTEM);
             foreach ($roles as $roleid=>$role) {
@@ -861,8 +862,9 @@ function xmldb_main_upgrade($oldversion=0) {
         }
     }
 
-    if ($result && $oldversion < 2007051801) {
-        //  Get the role id of the "Auth. User" role and check if the default role id is different
+    if (!empty($CFG->rolesactive) && $result && $oldversion < 2007051801) {
+        // Get the role id of the "Auth. User" role and check if the default role id is different
+        // note: use of assign_capability() is discouraged in upgrade script!
         $userrole = get_record( 'role', 'shortname', 'user' );
         $defaultroleid = $CFG->defaultuserroleid;