L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-mdl-39110-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2013-04-17 13:02:47 +01:00
parent 464ab7894b 1f02e1548f
commit ea4841fbef
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/filters/courserole.php
+2 -2
View File
@@ -132,8 +132,8 @@ class user_filter_courserole extends user_filter_type {
$a->label = $this->_label;
if ($roleid) {
$rolename = $DB->get_field('role', 'name', array('id'=>$roleid));
$a->rolename = '"'.format_string($rolename).'"';
$role = $DB->get_record('role', array('id'=>$roleid));
$a->rolename = '"'.role_get_name($role).'"';
} else {
$a->rolename = get_string('anyrole', 'filters');
}
user/filters/globalrole.php
+3 -2
View File
@@ -78,11 +78,12 @@ class user_filter_globalrole extends user_filter_type {
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);
}