From: Petr Skoda <skodak@moodle.org>
Date: Mon, 18 Oct 2010 08:26:57 +0000 (+0000)
Subject: MDL-24690 fixed incorrect cohort condition when auto-creating groups
X-Git-Tag: v2.0.0-rc2~506
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=d490ca8161efb7b1b27d5d01adb37d4f13d420e4;ds=inline

MDL-24690 fixed incorrect cohort condition when auto-creating groups
---

diff --git a/group/lib.php b/group/lib.php
index cdfa2e500e7..8fd4c127e4a 100644
--- a/group/lib.php
+++ b/group/lib.php
@@ -542,8 +542,8 @@ function groups_get_potential_members($courseid, $roleid = null, $cohortid = nul
     }
 
     if ($cohortid) {
-        $cohortjoin = "JOIN {cohort_members} cm ON cm.userid = u.id
-                       JOIN {cohort} c ON c.id = cm.cohortid";
+        $cohortjoin = "JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)";
+        $params['cohortid'] = $cohortid;
     } else {
         $cohortjoin = "";
     }