eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

don't use count() to check for empty page

Browse Source
This commit is contained in:
Evan Prodromou
2009-04-07 23:57:45 -04:00
parent c21335384e
commit 579332aa24
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
actions/favorited.php
View File

@@ -143,13 +143,10 @@ class FavoritedAction extends Action
$this->elementStart('div', 'instructions'); $this->elementStart('div', 'instructions');
$this->raw($output); $this->raw($output);
$this->elementEnd('div'); $this->elementEnd('div');
$favorite = new Fave;
if ($favorite->count()) {
return;
} }
function showEmptyList()
{
$message = _('Favorite notices appear on this page but no one has favorited one yet.') . ' '; $message = _('Favorite notices appear on this page but no one has favorited one yet.') . ' ';
if (common_logged_in()) { if (common_logged_in()) {
@@ -217,6 +214,10 @@ class FavoritedAction extends Action
$cnt = $nl->show(); $cnt = $nl->show();
if ($cnt == 0) {
$this->showEmptyList();
}
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'favorited'); $this->page, 'favorited');
} }

17
actions/public.php
View File

@@ -166,19 +166,8 @@ class PublicAction extends Action
$nav->show(); $nav->show();
} }
function showPageNotice() function showEmptyList()
{ {
$notice = new Notice;
if (!$notice) {
$this->serverError(_('Could not retrieve public stream.'));
return;
}
if ($notice->count()) {
return;
}
$message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' '; $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';
if (common_logged_in()) { if (common_logged_in()) {
@@ -216,6 +205,10 @@ class PublicAction extends Action
$cnt = $nl->show(); $cnt = $nl->show();
if ($cnt == 0) {
$this->showEmptyList();
}
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'public'); $this->page, 'public');
} }

8
actions/publictagcloud.php
View File

@@ -62,12 +62,10 @@ class PublictagcloudAction extends Action
$this->element('p', 'instructions', $this->element('p', 'instructions',
sprintf(_('These are most popular recent tags on %s '), sprintf(_('These are most popular recent tags on %s '),
common_config('site', 'name'))); common_config('site', 'name')));
$tags = new Notice_tag;
if ($tags->count()) {
return;
} }
function showEmptyList()
{
$message = _('No one has posted a notice with a [hashtag](%%doc.tags%%) yet.') . ' '; $message = _('No one has posted a notice with a [hashtag](%%doc.tags%%) yet.') . ' ';
if (common_logged_in()) { if (common_logged_in()) {
@@ -144,6 +142,8 @@ class PublictagcloudAction extends Action
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->elementEnd('div'); $this->elementEnd('div');
} else {
$this->showEmptyList();
} }
} }