Merge branch 'MDL-27040' of git://github.com/timhunt/moodle

moodle · Jul 6, 2011 · babbab1 · babbab1
2 parents cb600c4 + abc2575
commit babbab1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/accesslib.php b/lib/accesslib.php
@@ -5007,7 +5007,11 @@ function get_users_by_capability($context, $capability, $fields = '', $sort = ''
 
         if ($useviewallgroups) {
             $viewallgroupsusers = get_users_by_capability($context, 'moodle/site:accessallgroups', 'u.id, u.id', '', '', '', '', $exceptions);
-            $wherecond[] =  "($grouptest OR u.id IN (" . implode(',', array_keys($viewallgroupsusers)) . '))';
+            if (!empty($viewallgroupsusers)) {
+                $wherecond[] =  "($grouptest OR u.id IN (" . implode(',', array_keys($viewallgroupsusers)) . '))';
+            } else {
+                $wherecond[] =  "($grouptest)";
+            }
         } else {
             $wherecond[] =  "($grouptest)";
         }