fixed array_shift($roles) warning during upgrade from 1.6

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f4a9bb7f2f5b4cad5716e8dbc8487dccb5b99b90..9a168cf0c1bf4e9e66bf6b33a57790a4ba826767 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2225,23 +2225,24 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2006091901) {
-        $roles = get_records('role');
-        $first = array_shift($roles);
-        if (!empty($first->shortname)) {
-            // shortnames already exist
-        } else {
-            table_column('role', '', 'shortname', 'varchar', '100', '', '', 'not null', 'name');
-            $legacy_names = array('admin', 'coursecreator', 'editingteacher', 'teacher', 'student', 'guest');
-            foreach ($legacy_names as $name) {
-                if ($roles = get_roles_with_capability('moodle/legacy:'.$name, CAP_ALLOW)) {
-                    $i = '';
-                    foreach ($roles as $role) {
-                        if (empty($role->shortname)) {
-                            $updated = new object();
-                            $updated->id = $role->id;
-                            $updated->shortname = $name.$i;
-                            update_record('role', $updated);
-                            $i++;
+        if ($roles = get_records('role')) {
+            $first = array_shift($roles);
+            if (!empty($first->shortname)) {
+                // shortnames already exist
+            } else {
+                table_column('role', '', 'shortname', 'varchar', '100', '', '', 'not null', 'name');
+                $legacy_names = array('admin', 'coursecreator', 'editingteacher', 'teacher', 'student', 'guest');
+                foreach ($legacy_names as $name) {
+                    if ($roles = get_roles_with_capability('moodle/legacy:'.$name, CAP_ALLOW)) {
+                        $i = '';
+                        foreach ($roles as $role) {
+                            if (empty($role->shortname)) {
+                                $updated = new object();
+                                $updated->id = $role->id;
+                                $updated->shortname = $name.$i;
+                                update_record('role', $updated);
+                                $i++;
+                            }
                         }
                     }
                 }

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 58e1c564a525fce9b58110d3e0bca0f27f35005a..56f6b4c709322d8e66e9e8e4e9750a502e800290 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1825,23 +1825,24 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2006091901) {
-        $roles = get_records('role');
-        $first = array_shift($roles);
-        if (!empty($first->shortname)) {
-            // shortnames already exist
-        } else {
-            table_column('role', '', 'shortname', 'varchar', '100', '', '', 'not null', 'name');
-            $legacy_names = array('admin', 'coursecreator', 'editingteacher', 'teacher', 'student', 'guest');
-            foreach ($legacy_names as $name) {
-                if ($roles = get_roles_with_capability('moodle/legacy:'.$name, CAP_ALLOW)) {
-                    $i = '';
-                    foreach ($roles as $role) {
-                        if (empty($role->shortname)) {
-                            $updated = new object();
-                            $updated->id = $role->id;
-                            $updated->shortname = $name.$i;
-                            update_record('role', $updated);
-                            $i++;
+        if ($roles = get_records('role')) {
+            $first = array_shift($roles);
+            if (!empty($first->shortname)) {
+                // shortnames already exist
+            } else {
+                table_column('role', '', 'shortname', 'varchar', '100', '', '', 'not null', 'name');
+                $legacy_names = array('admin', 'coursecreator', 'editingteacher', 'teacher', 'student', 'guest');
+                foreach ($legacy_names as $name) {
+                    if ($roles = get_roles_with_capability('moodle/legacy:'.$name, CAP_ALLOW)) {
+                        $i = '';
+                        foreach ($roles as $role) {
+                            if (empty($role->shortname)) {
+                                $updated = new object();
+                                $updated->id = $role->id;
+                                $updated->shortname = $name.$i;
+                                update_record('role', $updated);
+                                $i++;
+                            }
                         }
                     }
                 }