Merge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/…

…moodle into MOODLE_23_STABLE
moodle · Aug 22, 2012 · 363b35f · 363b35f
2 parents e03a03a + f813d99
commit 363b35f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/enrol/category/locallib.php b/enrol/category/locallib.php
@@ -286,7 +286,10 @@ function enrol_category_sync_full($verbose = false) {
         }
         return 0;
     }
-    $rolenames = role_fix_names($roles, null, ROLENAME_SHORT, true);
+    $rolenames = array();
+    foreach($roles as $role) {
+        $rolenames[$role->id] = $role->shortname;
+    }
     if ($verbose) {
         mtrace('Synchronising category enrolments for roles: '.implode(', ', $rolenames).'...');
     }