Refs #3510, #3264. Ported fix for icons of messages from deleted users to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9143 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/messages/languages/en.php b/mod/messages/languages/en.php
index 8e4cd015f6a2e34af2ed66041b933b8f466247ab..2002905b73cf1ce400c30a78c23fcc2edf975ef3 100644 (file)
--- a/mod/messages/languages/en.php
+++ b/mod/messages/languages/en.php
@@ -88,6 +88,9 @@ $english = array(
        'messages:nomessages' => "There are no messages.",
        'messages:user:nonexist' => "We could not find the recipient in the user database.",
        'messages:user:blank' => "You did not select someone to send this to.",
+
+       'messages:deleted_sender' => 'Deleted user',
+
 );
                
 add_translation("en", $english);
\ No newline at end of file

diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index b52b86a3a573ba647685de021866f456f0efca0b..b2d127d85f08bfbed7c7635ab9c40cb88bcb3d2e 100644 (file)
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -19,11 +19,16 @@ if ($full) {
 if ($message->toId == elgg_get_page_owner_guid()) {
        // received
        $user = get_entity($message->fromId);
-       $icon = elgg_view_entity_icon($user, 'tiny');
-       $user_link = elgg_view('output/url', array(
-               'href' => "messages/compose?send_to=$user->guid",
-               'text' => $user->name,
-       ));
+       if ($user) {
+               $icon = elgg_view_entity_icon($user, 'tiny');
+               $user_link = elgg_view('output/url', array(
+                       'href' => "messages/compose?send_to=$user->guid",
+                       'text' => $user->name,
+               ));
+       } else {
+               $icon = '';
+               $user_link = elgg_echo('messages:deleted_sender');
+       }
 
        if ($message->readYet) {
                $class = 'message read';
@@ -34,11 +39,17 @@ if ($message->toId == elgg_get_page_owner_guid()) {
 } else {
        // sent
        $user = get_entity($message->toId);
-       $icon = elgg_view_entity_icon($user, 'tiny');
-       $user_link = elgg_view('output/url', array(
-               'href' => "messages/compose?send_to=$user->guid",
-               'text' => elgg_echo('messages:to_user', array($user->name)),
-       ));
+
+       if ($user) {
+               $icon = elgg_view_entity_icon($user, 'tiny');
+               $user_link = elgg_view('output/url', array(
+                       'href' => "messages/compose?send_to=$user->guid",
+                       'text' => elgg_echo('messages:to_user', array($user->name)),
+               ));
+       } else {
+               $icon = '';
+               $user_link = elgg_echo('messages:deleted_sender');
+       }
 
        $class = 'message read';
 }