X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;h=2826319c0d9e59ffc56c0de40e9d561efdc418f0;hb=20ca5027ccb30f094bc87189ef19ecdb59156137;hp=dc08592faf15f98096172dadddee6700fae9cc3e;hpb=693fecc44a70e25d5ef0ca784a462aadb487ef1e;p=quix0rs-gnu-social.git diff --git a/actions/all.php b/actions/all.php index dc08592faf..2826319c0d 100644 --- a/actions/all.php +++ b/actions/all.php @@ -58,9 +58,9 @@ class AllAction extends ProfileAction $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); + $this->notice = $this->user->noticeInboxThreaded(($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); + $this->notice = $this->user->noticesWithFriendsThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); } if ($this->page > 1 && $this->notice->N == 0) { @@ -127,12 +127,6 @@ class AllAction extends ProfileAction ); } - function showLocalNav() - { - $nav = new PersonalGroupNav($this); - $nav->show(); - } - function showEmptyListMessage() { // TRANS: Empty list message. %s is a user nickname. @@ -163,7 +157,7 @@ class AllAction extends ProfileAction function showContent() { if (Event::handle('StartShowAllContent', array($this))) { - $nl = new NoticeList($this->notice, $this); + $nl = new ThreadedNoticeList($this->notice, $this); $cnt = $nl->show();