fixed array_shift($roles) warning during upgrade from 1.6

This commit is contained in:
skodak 2006-09-27 22:16:23 +00:00
parent 1cd3eba948
commit 5d0df39db4
2 changed files with 36 additions and 34 deletions

View File

@ -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++;
}
}
}
}

View File

@ -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++;
}
}
}
}