Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
This commit is contained in:
commit
123f6d7d0c
|
@ -143,6 +143,25 @@ 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
$message = _('Favorite notices appear on this page but noone has favorited one yet.') . ' ';
|
||||||
|
|
||||||
|
if (common_logged_in()) {
|
||||||
|
$message .= _('Be the first to add a notice to your favorites by clicking the fave button next to any notice you like.');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$message .= _('Why not [register an account](%%action.register%%) and be the first to add a notice to your favorites!');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->elementStart('div', 'blankfiller');
|
||||||
|
$this->raw(common_markup_to_html($message));
|
||||||
|
$this->elementEnd('div');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -168,14 +168,13 @@ class PublicAction extends Action
|
||||||
|
|
||||||
function showPageNotice()
|
function showPageNotice()
|
||||||
{
|
{
|
||||||
$notice = Notice::publicStream(0, 1);
|
$notice = new Notice;
|
||||||
|
|
||||||
if (!$notice) {
|
if (!$notice) {
|
||||||
$this->serverError(_('Could not retrieve public stream.'));
|
$this->serverError(_('Could not retrieve public stream.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// no notices in the public stream, let's get out of here
|
|
||||||
if ($notice->count()) {
|
if ($notice->count()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ class PublictagcloudAction extends Action
|
||||||
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();
|
$tags = new Notice_tag;
|
||||||
if ($tags->count()) {
|
if ($tags->count()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user