From c79bad0601512191f9b7523cea6a222444cb92d0 Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Tue, 7 Apr 2009 22:16:09 +0000 Subject: [PATCH] fixed filler/guide text on personal timeline to take memcached into account. --- actions/all.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/actions/all.php b/actions/all.php index d457378dd7..dc5da3e005 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)); }