GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Actually use the PrimaryNoticeList in actions

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-01-08 20:29:09 +01:00
parent a3b9367c9a
commit 930b09677c
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/all.php
View File

@ -156,7 +156,7 @@ class AllAction extends ProfileAction
} }
if (!empty($current_user) && $current_user->streamModeOnly()) { 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 { } else {
$nl = new ThreadedNoticeList($this->notice, $this, $profile); $nl = new ThreadedNoticeList($this->notice, $this, $profile);
} }

2
actions/public.php
View File

@ -220,7 +220,7 @@ class PublicAction extends Action
$user = common_current_user(); $user = common_current_user();
if (!empty($user) && $user->streamModeOnly()) { if (!empty($user) && $user->streamModeOnly()) {
$nl = new NoticeList($this->notice, $this); $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
} else { } else {
$nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile); $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
} }

2
actions/replies.php
View File

@ -186,7 +186,7 @@ class RepliesAction extends Action
*/ */
function showContent() function showContent()
{ {
$nl = new NoticeList($this->notice, $this); $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
$cnt = $nl->show(); $cnt = $nl->show();
if (0 === $cnt) { if (0 === $cnt) {

2
actions/showgroup.php
View File

@ -149,7 +149,7 @@ class ShowgroupAction extends GroupAction
$user = common_current_user(); $user = common_current_user();
if (!empty($user) && $user->streamModeOnly()) { if (!empty($user) && $user->streamModeOnly()) {
$nl = new NoticeList($this->notice, $this); $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
} else { } else {
$nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile); $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
} }

2
actions/showprofiletag.php
View File

@ -254,7 +254,7 @@ class ShowprofiletagAction extends Action
function showNotices() function showNotices()
{ {
if (Event::handle('StartShowProfileTagContent', array($this))) { 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(); $cnt = $nl->show();

2
actions/tag.php
View File

@ -110,7 +110,7 @@ class TagAction extends ManagedAction
{ {
if(Event::handle('StartTagShowContent', array($this))) { 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(); $cnt = $nl->show();