Clarification to some group logic

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index dd3b5e535299d8ae524725ff8c82bbadb9ddc91d..d424d0ba74e167111a99f94e077209bfd0cc1d40 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -904,6 +904,10 @@ function remove_course_contents($courseid, $showfeedback=true) {
 function ismember($groupid, $userid=0) {
     global $USER;
 
+    if (!$groupid) {   // No point doing further checks
+        return false;
+    }
+
     if (!$userid) {
         if (empty($USER->groupmember)) {
             return false;
@@ -972,7 +976,7 @@ function get_current_group($courseid, $full=false) {
 
     if (empty($SESSION->currentgroup[$courseid])) {
         if (empty($USER->groupmember[$courseid])) {
-            return false;
+            return 0;
         } else {
             $SESSION->currentgroup[$courseid] = $USER->groupmember[$courseid];
         }