diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /mod/messages/views/default/object | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to 'mod/messages/views/default/object')
| -rw-r--r-- | mod/messages/views/default/object/messages.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php index b2d127d85..b12f98522 100644 --- a/mod/messages/views/default/object/messages.php +++ b/mod/messages/views/default/object/messages.php @@ -12,10 +12,6 @@ if (!$message) { return true; } -if ($full) { - $message->readYet = true; -} - if ($message->toId == elgg_get_page_owner_guid()) { // received $user = get_entity($message->fromId); @@ -24,6 +20,7 @@ if ($message->toId == elgg_get_page_owner_guid()) { $user_link = elgg_view('output/url', array( 'href' => "messages/compose?send_to=$user->guid", 'text' => $user->name, + 'is_trusted' => true, )); } else { $icon = ''; @@ -45,6 +42,7 @@ if ($message->toId == elgg_get_page_owner_guid()) { $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 = ''; @@ -63,13 +61,14 @@ if (!$full) { $subject_info .= elgg_view('output/url', array( 'href' => $message->getURL(), 'text' => $message->title, + 'is_trusted' => true, )); $delete_link = elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?guid=" . $message->getGUID(), - 'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>", + 'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>", 'confirm' => elgg_echo('deleteconfirm'), - 'text_encode' => false, + 'encode_text' => false, )); $body = <<<HTML |