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

ralferlebach · Jan 13, 2016 · 64858d4 · 64858d4
2 parents 1be8237 + 9488b6f
commit 64858d4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/user/index.php b/user/index.php
@@ -517,12 +517,12 @@
     $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));
     }