Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / actions / all.php

diff --git a/actions/all.php b/actions/all.php
index 12397b4b1821dd076e7f1e8c7a1bc129ff30e4e9..2826319c0d9e59ffc56c0de40e9d561efdc418f0 100644 (file)
--- 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.