mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

MDL-36941 core_message: fixed minor CiBoT complaints

Browse Source
This commit is contained in:
Mark Nelson 2018-03-12 13:10:39 +08:00
parent e159b53b5b
commit 99248f6177
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
message/classes/api.php
View File

@ -789,7 +789,7 @@ class api {
$conversationid = null;
$ignoremessages = false;
if (!empty($fromuserid)) {
$conversationid = \core_message\api::get_conversation_between_users([$touserid, $fromuserid]);
$conversationid = self::get_conversation_between_users([$touserid, $fromuserid]);
if (!$conversationid) { // If there is no conversation between the users then there are no messages to mark.
$ignoremessages = true;
}
@ -797,16 +797,16 @@ class api {
if (!empty($type)) {
if ($type == MESSAGE_TYPE_NOTIFICATION) {
\core_message\api::mark_all_notifications_as_read($touserid, $fromuserid);
self::mark_all_notifications_as_read($touserid, $fromuserid);
} else if ($type == MESSAGE_TYPE_MESSAGE) {
if (!$ignoremessages) {
\core_message\api::mark_all_messages_as_read($touserid, $conversationid);
self::mark_all_messages_as_read($touserid, $conversationid);
}
}
} else { // We want both.
\core_message\api::mark_all_notifications_as_read($touserid, $fromuserid);
self::mark_all_notifications_as_read($touserid, $fromuserid);
if (!$ignoremessages) {
\core_message\api::mark_all_messages_as_read($touserid, $conversationid);
self::mark_all_messages_as_read($touserid, $conversationid);
}
}
}