]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
fixed filler/guide text on personal timeline to take memcached into account.
authorRobin Millette <millette@controlyourself.ca>
Tue, 7 Apr 2009 22:16:09 +0000 (22:16 +0000)
committerRobin Millette <millette@controlyourself.ca>
Tue, 7 Apr 2009 22:16:09 +0000 (22:16 +0000)
actions/all.php

index d457378dd7e759e1fe22c2fe9a8597b34849bfc4..dc5da3e005ab0003a95d93654effc4ca7928d2a1 100644 (file)
@@ -75,13 +75,8 @@ class AllAction extends ProfileAction
         $nav->show();
     }
 
-    function showPageNotice()
+    function showEmptyListMessage()
     {
-        $notice = $this->user->noticesWithFriends(0, 1);
-        if ($notice->count()) {
-            return;
-        }
-
         $message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
@@ -109,6 +104,10 @@ class AllAction extends ProfileAction
 
         $cnt = $nl->show();
 
+        if (0 == $cnt) {
+            $this->showEmptyListMessage();
+        }
+
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'all', array('nickname' => $this->user->nickname));
     }