diff options
Diffstat (limited to 'mod/messages/views/default/object/messages.php')
| -rw-r--r-- | mod/messages/views/default/object/messages.php | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php index e000601f9..b12f98522 100644 --- a/mod/messages/views/default/object/messages.php +++ b/mod/messages/views/default/object/messages.php @@ -5,25 +5,27 @@ * @package ElggFile */ -$full = elgg_extract('full', $vars, false); +$full = elgg_extract('full_view', $vars, false); $message = elgg_extract('entity', $vars, false); if (!$message) { return true; } -if ($full) { - $message->readYet = true; -} - if ($message->toId == elgg_get_page_owner_guid()) { // received $user = get_entity($message->fromId); - $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); - $user_link = elgg_view('output/url', array( - 'href' => "pg/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, + 'is_trusted' => true, + )); + } else { + $icon = ''; + $user_link = elgg_echo('messages:deleted_sender'); + } if ($message->readYet) { $class = 'message read'; @@ -34,11 +36,18 @@ if ($message->toId == elgg_get_page_owner_guid()) { } else { // sent $user = get_entity($message->toId); - $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); - $user_link = elgg_view('output/url', array( - 'href' => "pg/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)), + 'is_trusted' => true, + )); + } else { + $icon = ''; + $user_link = elgg_echo('messages:deleted_sender'); + } $class = 'message read'; } @@ -52,13 +61,15 @@ if (!$full) { $subject_info .= elgg_view('output/url', array( 'href' => $message->getURL(), 'text' => $message->title, + 'is_trusted' => true, )); -$delete_link = "<span class='delete-button'>" . elgg_view("output/confirmlink", array( +$delete_link = elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?guid=" . $message->getGUID(), - 'text' => elgg_echo('delete'), + 'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>", 'confirm' => elgg_echo('deleteconfirm'), - )) . "</span>"; + 'encode_text' => false, + )); $body = <<<HTML <div class="messages-owner">$user_link</div> |