Merge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/s…

…kodak/moodle
ds125v · Jul 18, 2011 · b96fa1c · b96fa1c
2 parents 50a3053 + dfe42f0
commit b96fa1c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -2858,16 +2858,16 @@ function xmldb_main_upgrade($oldversion) {
             unset($role->capability);
             if ($role->archetype === 'admin') {
                 $i = '';
-                if ($DB->record_exists('role', array('shortname'=>'manager'))) {
+                if ($DB->record_exists('role', array('shortname'=>'manager')) or $DB->record_exists('role', array('name'=>get_string('manager', 'role')))) {
                     $i = 2;
-                    while($DB->record_exists('role', array('shortname'=>'manager'.$i))) {
+                    while($DB->record_exists('role', array('shortname'=>'manager'.$i)) or $DB->record_exists('role', array('name'=>get_string('manager', 'role').$i))) {
                         $i++;
                     }
                 }
                 $role->archetype = 'manager';
                 if ($role->shortname === 'admin') {
                     $role->shortname   = 'manager'.$i;
-                    $role->name        = get_string('manager', 'role');
+                    $role->name        = get_string('manager', 'role').$i;
                     $role->description = get_string('managerdescription', 'role');
                 }
             }