summaryrefslogtreecommitdiff
path: root/actions/all.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/all.php')
-rw-r--r--actions/all.php30
1 files changed, 9 insertions, 21 deletions
diff --git a/actions/all.php b/actions/all.php
index 38aee65b6..5db09a0e6 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -25,31 +25,11 @@ require_once INSTALLDIR.'/lib/feedlist.php';
class AllAction extends ProfileAction
{
- var $notice;
-
function isReadOnly($args)
{
return true;
}
- function prepare($args)
- {
- parent::prepare($args);
- $cur = common_current_user();
-
- if (!empty($cur) && $cur->id == $this->user->id) {
- $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
- } else {
- $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
- }
-
- if($this->page > 1 && $this->notice->N == 0){
- $this->serverError(_('No such page'),$code=404);
- }
-
- return true;
- }
-
function handle($args)
{
parent::handle($args);
@@ -120,7 +100,15 @@ class AllAction extends ProfileAction
function showContent()
{
- $nl = new NoticeList($this->notice, $this);
+ $cur = common_current_user();
+
+ if (!empty($cur) && $cur->id == $this->user->id) {
+ $notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+ } else {
+ $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+ }
+
+ $nl = new NoticeList($notice, $this);
$cnt = $nl->show();