Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

2 files changed, 5 insertions, 2 deletions

diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index 310485ee2..d41551be4 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -12,6 +12,9 @@ if (!$message) {
 	forward();
 }
 
+// mark the message as read
+$message->readYet = true;
+
 elgg_set_page_owner_guid($message->getOwnerGUID());
 $page_owner = elgg_get_page_owner_entity();
 
diff --git a/mod/messages/pages/messages/send.php b/mod/messages/pages/messages/send.php
index 1b821d185..b46d0ba52 100644
--- a/mod/messages/pages/messages/send.php
+++ b/mod/messages/pages/messages/send.php
@@ -8,14 +8,14 @@
 gatekeeper();
 
 $page_owner = elgg_get_logged_in_user_entity();
-set_page_owner($page_owner->getGUID());
+elgg_set_page_owner_guid($page_owner->getGUID());
 
 $title = elgg_echo('messages:add');
 
 elgg_push_breadcrumb($title);
 
 $params = messages_prepare_form_vars((int)get_input('send_to'));
-$params['friends'] = $page_owner->getFriends();
+$params['friends'] = $page_owner->getFriends('', 50);
 $content = elgg_view_form('messages/send', array(), $params);
 
 $body = elgg_view_layout('content', array(