Award criteria for ALL cohort - WHERE clause broken

The code to award a badge when the criteria requires being a member of multiple cohorts is broken.

It appears that the WHERE clause that's generated when seeing if a person is a member of ALL required cohorts doesn't work.

In criteria/award_criteria_cohort line 247ish reads:

$where = ' AND cm.cohortid = :cohortid'.$i;

When I believe it meant to read:

$where .= ' AND cm.cohortid = :cohortid'.$i;

How it's written means that anyone who is a member of the last cohort would be returned.

The second option would always return an empty set (unless I'm mistaken), because no row can meet the requirement of being in more than one cohort. I'm no SQL expert, so I could be dead wrong about this.

A solution chould use a GROUP BY and HAVING:

   WHERE ... AND (cm.cohortid = :cohortid1 OR cm.cohortid = :cohortid2)
GROUP BY u.id, bi.badgeid
   HAVING COUNT(cm.cohortid) = 2;