forked from GNUsocial/gnu-social
Actually use the PrimaryNoticeList in actions
This commit is contained in:
parent
a3b9367c9a
commit
930b09677c
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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) {
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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();
|
||||||
|
|
||||||
|
@ -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();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user