From b1593d3cfdbc43507a6943ea18af8a30b570121e Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 14 Dec 2017 10:13:52 +0100
Subject: [PATCH] Update from 1.11.x

---
 main/inc/lib/message.lib.php  | 4 ++--
 main/messages/new_message.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index bbf6657656..a60732d175 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1116,9 +1116,9 @@ class MessageManager
         $content = Security::remove_XSS($row['content'], STUDENT, true);
 
         $name = get_lang('UnknownUser');
+        $fromUser = api_get_user_info($user_sender_id);
         $userImage = '';
-        if (!empty($user_sender_id)) {
-            $fromUser = api_get_user_info($user_sender_id);
+        if (!empty($user_sender_id) && !empty($fromUser)) {
             $name = $fromUser['complete_name_with_username'];
             $userImage = Display::img(
                 $fromUser['avatar_small'],
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index 3dc85ebf03..c459a8ac0f 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -73,7 +73,8 @@ function show_compose_reply_to_message($message_id, $receiver_id)
     $result = Database::query($query);
     $row = Database::fetch_array($result, 'ASSOC');
 
-    if (empty($row['user_sender_id'])) {
+    $userInfo = api_get_user_info($row['user_sender_id']);
+    if (empty($row['user_sender_id']) || empty($userInfo)) {
         $html = get_lang('InvalidMessageId');
 
         return $html;