From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 20 Jan 2014 05:21:58 +0000 (+0800)
Subject: Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle
X-Git-Tag: v2.7.0-beta~687
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ac97a7ed53c9f51d707b4995a559664c689e1037;hp=3ab0a93347a8ef5046da7977e105f708966b45e7

Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle
---

diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index 123a166bc34..ac8816fc53a 100644
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -266,23 +266,12 @@ switch ($mode) {
                 $ufields = user_picture::fields('u');
                 list($sort, $sortparams) = users_order_by_sql('u');
                 $params = array_merge($params, $sortparams);
-                if (!empty($cm->groupingid)) {
-                    $params["groupingid"] = $cm->groupingid;
-                    $sql = "SELECT DISTINCT $ufields
-                            FROM {lesson_attempts} a
-                                INNER JOIN {user} u ON u.id = a.userid
-                                INNER JOIN {groups_members} gm ON gm.userid = u.id
-                                INNER JOIN {groupings_groups} gg ON gm.groupid = gg.groupid AND gg.groupingid = :groupingid
-                            WHERE a.lessonid = :lessonid
-                            ORDER BY $sort";
-                } else {
-                    $sql = "SELECT DISTINCT $ufields
-                            FROM {user} u,
-                                 {lesson_attempts} a
-                            WHERE a.lessonid = :lessonid and
-                                  u.id = a.userid
-                            ORDER BY $sort";
-                }
+                $sql = "SELECT DISTINCT $ufields
+                        FROM {user} u,
+                             {lesson_attempts} a
+                        WHERE a.lessonid = :lessonid and
+                              u.id = a.userid
+                        ORDER BY $sort";
                 if (!$users = $DB->get_records_sql($sql, $params)) {
                     $mode = 'none'; // not displaying anything
                     $lesson->add_message(get_string('noonehasanswered', 'lesson'));