aboutsummaryrefslogtreecommitdiff
path: root/mod/messages
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2013-02-13 20:03:50 +0100
committerSem <sembrestels@riseup.net>2013-02-13 20:03:50 +0100
commit9ae3522b674a311e963b07513e4eee3c4729d2cd (patch)
tree2f62765c7c53ddacb35c7ac8034cfb9867b33fd5 /mod/messages
parent5aff5b3913fbb6226d8fb3162453c58888fba38d (diff)
parentb3b12344bfee097b06019d6ee83b1952cb3088ea (diff)
downloadelgg-9ae3522b674a311e963b07513e4eee3c4729d2cd.tar.gz
elgg-9ae3522b674a311e963b07513e4eee3c4729d2cd.tar.bz2
Merge branch 'messages-reply' of git://github.com/sembrestels/Elgg into foxglove-2
Conflicts: mod/messages/pages/messages/read.php
Diffstat (limited to 'mod/messages')
-rw-r--r--mod/messages/actions/messages/send.php2
-rw-r--r--mod/messages/start.php3
-rw-r--r--mod/messages/views/default/forms/messages/reply.php7
3 files changed, 10 insertions, 2 deletions
diff --git a/mod/messages/actions/messages/send.php b/mod/messages/actions/messages/send.php
index 9d9f6c8b7..16a971ad2 100644
--- a/mod/messages/actions/messages/send.php
+++ b/mod/messages/actions/messages/send.php
@@ -11,7 +11,7 @@ $recipient_guid = get_input('recipient_guid');
elgg_make_sticky_form('messages');
-//$reply = get_input('reply',0); // this is the guid of the message replying to
+$reply = get_input('reply',0); // this is the guid of the message replying to
if (!$recipient_guid) {
register_error(elgg_echo("messages:user:blank"));
diff --git a/mod/messages/start.php b/mod/messages/start.php
index e17640098..50952ef4b 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -93,6 +93,9 @@ function messages_page_handler($page) {
$page[1] = elgg_get_logged_in_user_entity()->username;
}
+ $user = get_user_by_username($page[1]);
+ //elgg_set_page_owner_guid($user->guid);
+
$base_dir = elgg_get_plugins_path() . 'messages/pages/messages';
switch ($page[0]) {
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index 9f3f4b57e..a0a01afce 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -15,6 +15,11 @@ echo elgg_view('input/hidden', array(
'name' => 'recipient_guid',
'value' => $vars['message']->fromId,
));
+echo elgg_view('input/hidden', array(
+ 'name' => 'reply',
+ 'value' => $vars['message']->guid,
+));
+
?>
<div>
@@ -35,4 +40,4 @@ echo elgg_view('input/hidden', array(
</div>
<div class="elgg-foot">
<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</div> \ No newline at end of file
+</div>