L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46620-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-08-03 20:01:51 +02:00
parent 753493ae11 e89b812518
commit 71591d7822
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+7 -6
View File
@@ -8699,8 +8699,7 @@ function message_popup_window() {
}
// There are unread messages so now do a more complex but slower query.
$namefields = get_all_user_name_fields(true, 'u');
$messagesql = "SELECT m.id, m.smallmessage, m.fullmessageformat, m.notification, m.useridto, m.useridfrom, $namefields, c.blocked
$messagesql = "SELECT m.id, c.blocked
FROM {message} m
JOIN {message_working} mw ON m.id=mw.unreadmessageid
JOIN {message_processors} p ON mw.processorid=p.id
@@ -8717,13 +8716,15 @@ function message_popup_window() {
$messagesql .= 'AND m.timecreated > :lastpopuptime';
}
$messageusers = $DB->get_records_sql($messagesql, array('userid' => $USER->id, 'lastpopuptime' => $USER->message_lastpopup));
$waitingmessages = $DB->get_records_sql($messagesql, array('userid' => $USER->id, 'lastpopuptime' => $USER->message_lastpopup));
$validmessages = 0;
foreach($messageusers as $message) {
if ($message->blocked) {
foreach ($waitingmessages as $messageinfo) {
if ($messageinfo->blocked) {
// Message is from a user who has since been blocked so just mark it read.
message_mark_message_read($message, time());
// Get the full message to mark as read.
$messageobject = $DB->get_record('message', array('id' => $messageinfo->id));
message_mark_message_read($messageobject, time());
} else {
$validmessages++;
}