Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle

2013-04-09 14:58:47 +08:00
parent 0ae1b8a294 6f55ce1893
commit ad84f8f9ac
1 changed files with 2 additions and 2 deletions
@@ -157,10 +157,10 @@ class enrol_users_filter_form extends moodleform {
        // names if applied. The reason for not restricting to roles that can
        // be assigned at course level is that upper-level roles display in the
        // enrolments table so it makes sense to let users filter by them.
-        $allroles = get_all_roles($manager->get_context());
+        $allroles = $manager->get_all_roles();
        $rolenames = array();
        foreach ($allroles as $id => $role) {
-            $rolenames[$id] = $role->name;
+            $rolenames[$id] = $role->localname;
        }
        $mform->addElement('select', 'role', get_string('role'),
                array(0 => get_string('all')) + $rolenames);