aboutsummaryrefslogtreecommitdiff
path: root/mod/messages/pages
diff options
context:
space:
mode:
authorEvan Winslow <evan@elgg.org>2012-10-09 21:52:04 -0700
committerEvan Winslow <evan@elgg.org>2012-10-09 21:52:04 -0700
commitf888fa1d02bcd8f24d53566bf30d6466f6c00e78 (patch)
tree8c4236341f7432220f1b7dd2b25764808fbfdbe1 /mod/messages/pages
parentb1e9476d976d054107c60c91d23bc343edc39093 (diff)
parenta050a89b56f47145a32a7f913c674cdf1f5b7bfc (diff)
downloadelgg-f888fa1d02bcd8f24d53566bf30d6466f6c00e78.tar.gz
elgg-f888fa1d02bcd8f24d53566bf30d6466f6c00e78.tar.bz2
Merge pull request #402 from beck24/#4842-messages-reply-invalid-user
Fixes #4842 - only show 'reply' button when a message can actually be replied to
Diffstat (limited to 'mod/messages/pages')
-rw-r--r--mod/messages/pages/messages/read.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index 19e3ecdd7..fd3b466a1 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -38,8 +38,9 @@ if ($inbox) {
);
$body_params = array('message' => $message);
$content .= elgg_view_form('messages/reply', $form_params, $body_params);
-
- if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+ $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',
'href' => '#messages-reply-form',