1 files changed, 5 insertions, 6 deletions
diff --git a/actions/all.php b/actions/all.php
index d457378dd..dc5da3e00 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -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));
     }