summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-04-07 22:16:09 +0000
committerRobin Millette <millette@controlyourself.ca>2009-04-07 22:16:09 +0000
commitc79bad0601512191f9b7523cea6a222444cb92d0 (patch)
tree89723a5f2718aaaca92d31df5f70609d07cb0487
parent50b32227d1c4bb6fa5c6f81077ddd4a21981e639 (diff)
fixed filler/guide text on personal timeline to take memcached into account.
-rw-r--r--actions/all.php11
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));
}