diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-06-14 00:23:48 +0000 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-06-14 00:23:48 +0000 |
commit | d0eb2058a519941e205f7b0960d9a5e0707207bb (patch) | |
tree | 37ed1aa1be3c3a7a58463964ce602565c79f8cdf /actions/inbox.php | |
parent | a887d4fe8b1f5e5adc2d701384acf50cf2cf54c3 (diff) | |
parent | dbbb3a4fb558ee4372e157612f3e053a87a53a8e (diff) |
Merge branch '0.8.x' into userdesign
Conflicts:
actions/showfavorites.php
lib/action.php
Diffstat (limited to 'actions/inbox.php')
-rw-r--r-- | actions/inbox.php | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/actions/inbox.php b/actions/inbox.php index 7b5cf2d20..f14ba631f 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -46,15 +46,15 @@ require_once INSTALLDIR.'/lib/mailbox.php'; class InboxAction extends MailboxAction { - + /** * Title of the page * * @return string page title */ - + function title() - { + { if ($this->page > 1) { return sprintf(_("Inbox for %s - page %d"), $this->user->nickname, $this->page); @@ -64,21 +64,10 @@ class InboxAction extends MailboxAction } /** - * Output document relationship links - * - * @return void - */ - function showRelationshipLinks() - { - $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME - $this->page, 'inbox', array('nickname' => $this->user->nickname)); - } - - /** * Retrieve the messages for this user and this page * * Does a query for the right messages - * + * * @return Message data object with stream for messages * * @see MailboxAction::getMessages() @@ -95,7 +84,7 @@ class InboxAction extends MailboxAction if ($message->find()) { return $message; - } else { + } else { return null; } } |