From 186fc534013e3620c8dd657945bda8fe6ea3391e Mon Sep 17 00:00:00 2001
From: Tim Lock <tim.lock@netspot.com.au>
Date: Mon, 5 Mar 2012 12:18:58 +1030
Subject: [PATCH] MDL-31869: Searching for users in messaging with multiple
 roles generates a warning

---
 message/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/message/lib.php b/message/lib.php
index c3801e1fc0c..f1d5d3bd8f9 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -1497,7 +1497,7 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='')
 
         // everyone who has a role assignment in this course or higher
         $params = array($USER->id, "%$searchtext%");
-        $users = $DB->get_records_sql("SELECT $ufields, mc.id as contactlistid, mc.blocked
+        $users = $DB->get_records_sql("SELECT DISTINCT $ufields, mc.id as contactlistid, mc.blocked
                                          FROM {user} u
                                          JOIN {role_assignments} ra ON ra.userid = u.id
                                          LEFT JOIN {message_contacts} mc