aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-11-11 19:36:44 -0500
committerSteve Clay <steve@mrclay.org>2012-11-11 19:36:44 -0500
commitcf78b4d7b4b9a8a3c57cea779aeca9cbe7ace7ed (patch)
treeafa9e59f1570a41681e432eb2c7c24dcdbd1eb36 /mod
parent9b714e32ad6bddbaddbbf278fa82dbb3308bb412 (diff)
parentff19c7ba9265a396d34182f369ee4e4c3269a438 (diff)
downloadelgg-cf78b4d7b4b9a8a3c57cea779aeca9cbe7ace7ed.tar.gz
elgg-cf78b4d7b4b9a8a3c57cea779aeca9cbe7ace7ed.tar.bz2
Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
Diffstat (limited to 'mod')
-rw-r--r--mod/messages/pages/messages/read.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index eb36eaa4b..a64623564 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -38,7 +38,7 @@ if ($inbox) {
);
$body_params = array('message' => $message);
$content .= elgg_view_form('messages/reply', $form_params, $body_params);
- $from_user = get_user($message->fromID);
+ $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(