From 0b9873f2a5b6cf6bdbc8354eaa81ec06a52467d3 Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Thu, 2 Nov 2006 02:10:53 +0000
Subject: [PATCH] merged fix for MDL_7112 select distinct on text fields

---
 mod/data/filter.php | 2 +-
 mod/forum/lib.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/data/filter.php b/mod/data/filter.php
index 2030eb70b8..d0e9cc6c4d 100644
--- a/mod/data/filter.php
+++ b/mod/data/filter.php
@@ -25,7 +25,7 @@
         if (empty($contentlist)) {
             // We look for text field contents only, and only if the field has
             // autolink enabled (param1).
-            $sql = 'SELECT DISTINCT(dc.id) AS contentid, ' .
+            $sql = 'SELECT dc.id AS contentid, ' .
                    'dr.id AS recordid, ' .
                    'dc.content AS content, ' .
                    'd.id AS dataid ' .
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index eddef52348..6d9097c58a 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1157,7 +1157,7 @@ function forum_get_readable_forums($userid, $courseid=0) {
             $selecthidden = '';
         }
         
-        $selectforums = "SELECT DISTINCT(f.id) AS id,
+        $selectforums = "SELECT f.id AS id,
                                 f.name AS name,
                                 f.type AS type,
                                 f.course AS course,
@@ -2907,7 +2907,7 @@ function forum_user_has_posted_discussion($forumid, $userid) {
 function forum_discussions_user_has_posted_in($forumid, $userid) {
     global $CFG;
 
-    $haspostedsql = "SELECT DISTINCT(d.id) AS id,
+    $haspostedsql = "SELECT d.id AS id,
                             d.*
                        FROM {$CFG->prefix}forum_posts p,
                             {$CFG->prefix}forum_discussions d
-- 
2.39.5