moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2011-03-21 11:54:20 +08:00
commit 9d61397181
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
message/lib.php
View file

@ -1441,8 +1441,8 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='')
// everyone who has a role assignment in this course or higher // everyone who has a role assignment in this course or higher
$params = array($USER->id, "%$searchtext%"); $params = array($USER->id, "%$searchtext%");
$users = $DB->get_records_sql("SELECT $ufields, $users = $DB->get_records_sql("SELECT $ufields, mc.id as contactlistid, mc.blocked
FROM {user} u, mc.id as contactlistid, mc.blocked FROM {user} u
JOIN {role_assignments} ra ON ra.userid = u.id JOIN {role_assignments} ra ON ra.userid = u.id
LEFT JOIN {message_contacts} mc LEFT JOIN {message_contacts} mc
ON mc.contactid = u.id AND mc.userid = ? ON mc.contactid = u.id AND mc.userid = ?