Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 06:26:57 +0000 (14:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 06:26:57 +0000 (14:26 +0800)
lib/moodlelib.php

index 7d89756..3169d1a 100644 (file)
@@ -8638,7 +8638,6 @@ function message_popup_window() {
                      FROM {message} m
                      JOIN {message_working} mw ON m.id=mw.unreadmessageid
                      JOIN {message_processors} p ON mw.processorid=p.id
-                     JOIN {user} u ON m.useridfrom=u.id
                      LEFT JOIN {message_contacts} c ON c.contactid = m.useridfrom
                                                    AND c.userid = m.useridto
                     WHERE m.useridto = :userid