summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/favorited.php17
-rw-r--r--actions/public.php17
-rw-r--r--actions/publictagcloud.php10
3 files changed, 19 insertions, 25 deletions
diff --git a/actions/favorited.php b/actions/favorited.php
index 27da25435..09ab1216a 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -104,9 +104,9 @@ class FavoritedAction extends Action
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
+
common_set_returnto($this->selfUrl());
-
+
return true;
}
@@ -143,13 +143,10 @@ class FavoritedAction extends Action
$this->elementStart('div', 'instructions');
$this->raw($output);
$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.') . ' ';
if (common_logged_in()) {
@@ -217,6 +214,10 @@ class FavoritedAction extends Action
$cnt = $nl->show();
+ if ($cnt == 0) {
+ $this->showEmptyList();
+ }
+
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'favorited');
}
diff --git a/actions/public.php b/actions/public.php
index b7b7fc6b7..5a380de9a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -166,19 +166,8 @@ class PublicAction extends Action
$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.') . ' ';
if (common_logged_in()) {
@@ -216,6 +205,10 @@ class PublicAction extends Action
$cnt = $nl->show();
+ if ($cnt == 0) {
+ $this->showEmptyList();
+ }
+
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'public');
}
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 0cd8940d4..855cfed9b 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -62,12 +62,10 @@ class PublictagcloudAction extends Action
$this->element('p', 'instructions',
sprintf(_('These are most popular recent tags on %s '),
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.') . ' ';
if (common_logged_in()) {
@@ -144,6 +142,8 @@ class PublictagcloudAction extends Action
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementEnd('div');
+ } else {
+ $this->showEmptyList();
}
}