Merge branch 'MDL-52649-master' of git://github.com/junpataleta/moodle

2016-01-13 08:58:29 +08:00
parent 1be8237d41 9488b6f3a4
commit 64858d435c
1 changed files with 2 additions and 2 deletions
@@ -517,12 +517,12 @@ if ($roleid > 0) {
    $a->role = $rolenames[$roleid];
    $heading = format_string(get_string('xuserswiththerole', 'role', $a));

-    if ($currentgroup and $group) {
+    if ($currentgroup and !empty($group)) {
        $a->group = $group->name;
        $heading .= ' ' . format_string(get_string('ingroup', 'role', $a));
    }

-    if ($accesssince) {
+    if ($accesssince && !empty($timeoptions[$accesssince])) {
        $a->timeperiod = $timeoptions[$accesssince];
        $heading .= ' ' . format_string(get_string('inactiveformorethan', 'role', $a));
    }