fixed filler/guide text on personal timeline to take memcached into account.
This commit is contained in:
parent
50b32227d1
commit
c79bad0601
|
@ -75,13 +75,8 @@ class AllAction extends ProfileAction
|
||||||
$nav->show();
|
$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) . ' ';
|
$message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
|
||||||
|
|
||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
|
@ -109,6 +104,10 @@ class AllAction extends ProfileAction
|
||||||
|
|
||||||
$cnt = $nl->show();
|
$cnt = $nl->show();
|
||||||
|
|
||||||
|
if (0 == $cnt) {
|
||||||
|
$this->showEmptyListMessage();
|
||||||
|
}
|
||||||
|
|
||||||
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
|
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
|
||||||
$this->page, 'all', array('nickname' => $this->user->nickname));
|
$this->page, 'all', array('nickname' => $this->user->nickname));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user