summaryrefslogtreecommitdiff
path: root/actions/public.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/public.php')
-rw-r--r--actions/public.php21
1 files changed, 7 insertions, 14 deletions
diff --git a/actions/public.php b/actions/public.php
index 5a2720a9a..5a380de9a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -166,20 +166,9 @@ 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 noone has posted anything yet.') . ' ';
+ $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';
if (common_logged_in()) {
$message .= _('Be the first to post!');
@@ -188,7 +177,7 @@ class PublicAction extends Action
$message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
}
- $this->elementStart('div', 'blankfiller');
+ $this->elementStart('div', 'guide');
$this->raw(common_markup_to_html($message));
$this->elementEnd('div');
}
@@ -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');
}