aboutsummaryrefslogtreecommitdiff
path: root/mod/messages/pages
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-12-05 01:32:32 +0100
committerSem <sembrestels@riseup.net>2012-12-05 01:32:32 +0100
commit75d7fd1106dcd97e2a3ccb25bd4df780a66b82dd (patch)
treef17476c8ffb7da7dc7488ebdbf1851968b4485b8 /mod/messages/pages
parent306c043a720bc51070652366ef929bc612f0bcbb (diff)
parentb3b12344bfee097b06019d6ee83b1952cb3088ea (diff)
downloadelgg-75d7fd1106dcd97e2a3ccb25bd4df780a66b82dd.tar.gz
elgg-75d7fd1106dcd97e2a3ccb25bd4df780a66b82dd.tar.bz2
Merge branch 'messages-reply' of git://github.com/sembrestels/Elgg into foxglove-1
Conflicts: mod/messages/pages/messages/read.php
Diffstat (limited to 'mod/messages/pages')
-rw-r--r--mod/messages/pages/messages/read.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index a64623564..c25ba9ec3 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -39,7 +39,6 @@ if ($inbox) {
$body_params = array('message' => $message);
$content .= elgg_view_form('messages/reply', $form_params, $body_params);
$from_user = get_user($message->fromId);
-
if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid() && $from_user) {
elgg_register_menu_item('title', array(
'name' => 'reply',