From: moodler <moodler>
Date: Wed, 16 Jan 2008 06:12:59 +0000 (+0000)
Subject: Merged fix for SQL error in JOIN   MDL-12990
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3ff19e09d260da6231182a5d4c27b98dc9146aeb;p=moodle.git

Merged fix for SQL error in JOIN   MDL-12990
---

diff --git a/message/lib.php b/message/lib.php
index 1d1d51738b..84d1f040f9 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -44,6 +44,7 @@ function message_print_contacts() {
                       ON u.id = mc.contactid
                    LEFT OUTER JOIN {$CFG->prefix}message m
                       ON m.useridfrom = mc.contactid
+                      AND m.useridto = {$USER->id}
                    WHERE mc.userid = {$USER->id}
                          AND mc.blocked = 0 
                    GROUP BY u.id, u.firstname, u.lastname, u.picture,