Merged fix for SQL error in JOIN MDL-12990

diff --git a/message/lib.php b/message/lib.php
index 1d1d51738bf82ef1ce04b8351737eadc93bfa31f..84d1f040f995a772bf78ee34124decdb93cd08d4 100644 (file)
--- 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,