diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-22 16:56:55 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-22 16:56:55 +0000 |
| commit | 1d33c3fd07fbfa41359af0e99079f57f022e7124 (patch) | |
| tree | 7c8a11ab79801d4545aa8ca6ec8be1f231b2b287 /mod/messages | |
| parent | a140ef9c53edb2e249eab2eafccc6eb8c0952dab (diff) | |
| download | elgg-1d33c3fd07fbfa41359af0e99079f57f022e7124.tar.gz elgg-1d33c3fd07fbfa41359af0e99079f57f022e7124.tar.bz2 | |
Merged 1.7 bugfixes back into core. (5376:HEAD).
git-svn-id: http://code.elgg.org/elgg/trunk@5471 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/messages')
| -rw-r--r-- | mod/messages/index.php | 3 | ||||
| -rw-r--r-- | mod/messages/sent.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mod/messages/index.php b/mod/messages/index.php index 97c1cfff4..28a874635 100644 --- a/mod/messages/index.php +++ b/mod/messages/index.php @@ -22,6 +22,7 @@ $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); // Get the user's inbox, this will be all messages where the 'toId' field matches their guid +// @todo - fix hack where limit + 1 messages are requested $messages = elgg_get_entities_from_metadata(array( 'type' => 'object', 'subtype' => 'messages', @@ -49,4 +50,4 @@ $body = elgg_view_layout("one_column_with_sidebar", $area2); // Draw page -page_draw(sprintf(elgg_echo('messages:user'),$page_owner->name),$body);
\ No newline at end of file +page_draw(sprintf(elgg_echo('messages:user'),$page_owner->name),$body); diff --git a/mod/messages/sent.php b/mod/messages/sent.php index 4f432b47f..6aea2e561 100644 --- a/mod/messages/sent.php +++ b/mod/messages/sent.php @@ -25,7 +25,8 @@ $offset = get_input('offset',0); $limit = 10; // Display all the messages a user owns, these will make up the sentbox -$messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', 'metadata_value' => $_SESSION['user']->guid, 'types' => 'object', 'subtypes' => 'messages', 'owner_guid' => $page_owner->guid, 'limit' => $limit, 'offset' => $offset)); +// @todo - fix hack where limit + 1 is passed +$messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', 'metadata_value' => $_SESSION['user']->guid, 'types' => 'object', 'subtypes' => 'messages', 'owner_guid' => $page_owner->guid, 'limit' => $limit + 1, 'offset' => $offset)); // Set the page title @@ -40,4 +41,4 @@ $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_vie $body = elgg_view_layout("one_column_with_sidebar", $area2); // Draw page -page_draw(sprintf(elgg_echo('messages:sentMessages'),$page_owner->name),$body);
\ No newline at end of file +page_draw(sprintf(elgg_echo('messages:sentMessages'),$page_owner->name),$body); |