mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Marina Glancy 2013-11-04 15:59:27 +11:00
commit ad5a1a5d48
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/moodlelib.php
View File

@ -8611,7 +8611,8 @@ function message_popup_window() {
}
// Got unread messages so now do another query that joins with the user table.
$messagesql = "SELECT m.id, m.smallmessage, m.fullmessageformat, m.notification, u.firstname, u.lastname
$namefields = get_all_user_name_fields(true, 'u');
$messagesql = "SELECT m.id, m.smallmessage, m.fullmessageformat, m.notification, $namefields
FROM {message} m
JOIN {message_working} mw ON m.id=mw.unreadmessageid
JOIN {message_processors} p ON mw.processorid=p.id