From 930b09677c7a00a357ed145840434e760b076135 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 8 Jan 2015 20:29:09 +0100 Subject: [PATCH] Actually use the PrimaryNoticeList in actions --- actions/all.php | 2 +- actions/public.php | 2 +- actions/replies.php | 2 +- actions/showgroup.php | 2 +- actions/showprofiletag.php | 2 +- actions/tag.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/actions/all.php b/actions/all.php index 5933d00946..d6dd8e8af5 100644 --- a/actions/all.php +++ b/actions/all.php @@ -156,7 +156,7 @@ class AllAction extends ProfileAction } if (!empty($current_user) && $current_user->streamModeOnly()) { - $nl = new NoticeList($this->notice, $this); + $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE)); } else { $nl = new ThreadedNoticeList($this->notice, $this, $profile); } diff --git a/actions/public.php b/actions/public.php index 5e07a893ff..6ebd48ba12 100644 --- a/actions/public.php +++ b/actions/public.php @@ -220,7 +220,7 @@ class PublicAction extends Action $user = common_current_user(); if (!empty($user) && $user->streamModeOnly()) { - $nl = new NoticeList($this->notice, $this); + $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE)); } else { $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile); } diff --git a/actions/replies.php b/actions/replies.php index d6d2cb4ba9..4932520fd6 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -186,7 +186,7 @@ class RepliesAction extends Action */ function showContent() { - $nl = new NoticeList($this->notice, $this); + $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE)); $cnt = $nl->show(); if (0 === $cnt) { diff --git a/actions/showgroup.php b/actions/showgroup.php index e2b5e8d547..46d0a227f5 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -149,7 +149,7 @@ class ShowgroupAction extends GroupAction $user = common_current_user(); if (!empty($user) && $user->streamModeOnly()) { - $nl = new NoticeList($this->notice, $this); + $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE)); } else { $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile); } diff --git a/actions/showprofiletag.php b/actions/showprofiletag.php index 44ded832b8..d96acec590 100644 --- a/actions/showprofiletag.php +++ b/actions/showprofiletag.php @@ -254,7 +254,7 @@ class ShowprofiletagAction extends Action function showNotices() { if (Event::handle('StartShowProfileTagContent', array($this))) { - $nl = new NoticeList($this->notice, $this); + $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE)); $cnt = $nl->show(); diff --git a/actions/tag.php b/actions/tag.php index 5e52630c85..0fc2c5152e 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -110,7 +110,7 @@ class TagAction extends ManagedAction { if(Event::handle('StartTagShowContent', array($this))) { - $nl = new NoticeList($this->notice, $this); + $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE)); $cnt = $nl->show();