Award criteria for ALL cohort - WHERE clause broken

I'll pull some testing instructions out of my comments below. The code ends up functioning correctly as-is, but it's only because review() in award_criteria_cohort.php catches the error . Let me see if I can explain. Consider the following scenario: Create two cohorts (id X and Y) Create a badge that requires a user to be in both cohorts. Don't enable the badge. Create a user (id Z) and put them in the second cohort (id Y). Enable the badge (this is only evident when review_all_criteria() in badge/classes/badge.php is called) The SQL generated by get_completed_criteria_sql() in award_criteria_cohort.php would produce the user ID (Z) of the user, even though that user is not in both cohorts, because the WHERE clause doesn't aggregate the AND clauses correctly. The generated WHERE clause ends up reading: WHERE bi.badgeid IS NULL AND u.id != :guestid AND     u.deleted = 0 AND cm.cohortid = :cohortid2 When it should read: WHERE bi.badgeid IS NULL AND u.id != :guestid AND     u.deleted = 0 AND cm.cohortid = :cohortid1 AND cm.cohortid = :cohortid2