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

Merge branch 'MDL-63549-master' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2018-11-02 10:17:54 +08:00
parent ec859d9f4b aa74835164
commit fb3ab37a67
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/classes/api.php
+6 -5
View File
@@ -543,11 +543,12 @@ class api {
// Now, create the final return structure.
$arrconversations = [];
foreach ($conversations as $conversation) {
// It's possible other users have been deleted.
// In cases like this, we still want to include the conversation if it's of type 'group'.
// Individual conversations are skipped if the other member has been deleted.
if (isset($deletedmembers[$conversation->id]) &&
$conversation->conversationtype == self::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL) {
// Do not include any individual conversation which:
// a) Contains a deleted member or
// b) Does not contain a recent message for the user (this happens if the user has deleted all messages).
// Group conversations with deleted users or no messages are always returned.
if ($conversation->conversationtype == self::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
&& (isset($deletedmembers[$conversation->id]) || empty($conversation->messageid))) {
continue;
}