Browse Source

Fix "UnknownUser" message in the inbox see BT#14824

Julio 6 years ago
parent
commit
688a86edd9
1 changed files with 9 additions and 3 deletions
  1. 9 3
      main/inc/lib/message.lib.php

+ 9 - 3
main/inc/lib/message.lib.php

@@ -1292,12 +1292,13 @@ class MessageManager
     {
         $table = Database::get_main_table(TABLE_MESSAGE);
         $messageId = (int) $messageId;
+        $currentUserId = api_get_user_id();
 
         if ($source == 'outbox') {
             if (isset($messageId) && is_numeric($messageId)) {
                 $query = "SELECT * FROM $table
                           WHERE
-                            user_sender_id = ".api_get_user_id()." AND
+                            user_sender_id = ".$currentUserId." AND
                             id = $messageId AND
                             msg_status = ".MESSAGE_STATUS_OUTBOX;
                 $result = Database::query($query);
@@ -1307,19 +1308,24 @@ class MessageManager
                 $query = "UPDATE $table SET
                           msg_status = '".MESSAGE_STATUS_NEW."'
                           WHERE
-                            user_receiver_id=".api_get_user_id()." AND
+                            user_receiver_id=".$currentUserId." AND
                             id='".$messageId."'";
                 Database::query($query);
 
                 $query = "SELECT * FROM $table
                           WHERE
                             msg_status<> ".MESSAGE_STATUS_OUTBOX." AND
-                            user_receiver_id=".api_get_user_id()." AND
+                            user_receiver_id=".$currentUserId." AND
                             id='".$messageId."'";
                 $result = Database::query($query);
             }
         }
         $row = Database::fetch_array($result, 'ASSOC');
+
+        if (empty($row)) {
+            return '';
+        }
+
         $user_sender_id = $row['user_sender_id'];
 
         // get file attachments by message id