Merge branch 'wip-mdl-39110-m24' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_24_STABLE
moodle · Apr 17, 2013 · ea4841f · ea4841f
2 parents 464ab78 + 1f02e15
commit ea4841f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/user/filters/courserole.php b/user/filters/courserole.php
@@ -132,8 +132,8 @@ function get_label($data) {
         $a->label = $this->_label;
 
         if ($roleid) {
-            $rolename = $DB->get_field('role', 'name', array('id'=>$roleid));
+            $role = $DB->get_record('role', array('id'=>$roleid));
-            $a->rolename = '"'.format_string($rolename).'"';
+            $a->rolename = '"'.role_get_name($role).'"';
         } else {
             $a->rolename = get_string('anyrole', 'filters');
         }

diff --git a/user/filters/globalrole.php b/user/filters/globalrole.php
@@ -78,11 +78,12 @@ function get_sql_filter($data) {
     function get_label($data) {
         global $DB;
 
-        $rolename = $DB->get_field('role', 'name', array('id'=>$data['value']));
+        $role = $DB->get_record('role', array('id'=>$data['value']));
+
 
         $a = new stdClass();
         $a->label = $this->_label;
-        $a->value = '"'.format_string($rolename).'"';
+        $a->value = '"'.role_get_name($role).'"';
 
         return get_string('globalrolelabel', 'filters', $a);
     }