mirror of
https://github.com/moodle/moodle.git
synced 2025-04-22 00:42:54 +02:00
Merge branch 'wip-mdl-39110' of git://github.com/rajeshtaneja/moodle
This commit is contained in:
commit
500f9a4c9d
@ -129,8 +129,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');
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user