Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1

LimeSurvey · Nov 30, 2012 · f2b85f1 · f2b85f1
2 parents 5d22c11 + 1999a5b
commit f2b85f1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/models/Participants.php b/application/models/Participants.php
@@ -172,7 +172,7 @@ function getParticipantsOwner($userid)
             ->from('{{participants}}')
             ->leftJoin('{{participant_shares}}', ' {{participants}}.participant_id={{participant_shares}}.participant_id')
             ->where('owner_uid = :userid1 OR share_uid = :userid2')
-            ->group('{{participants}}.participant_id');
+            ->group('{{participants}}.participant_id,{{participant_shares}}.can_edit');
 
         $command = Yii::app()->db->createCommand()
                 ->select('p.*, ps.can_edit')