diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2009-03-26 06:56:52 +0100 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2009-03-26 06:56:52 +0100 |
commit | d1bf8b2143f597d9d1b1e7ff472532c596200011 (patch) | |
tree | 82f1440a20f5b0e8e942366b7106a9e2ee66f5ff /actions/showstream.php | |
parent | 25e9e2b83fc7e1fdbc7d03bac17cc2530ce836e1 (diff) | |
parent | 959d9eda2304df317719ff9768cb555210c98ad0 (diff) |
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
Diffstat (limited to 'actions/showstream.php')
-rw-r--r-- | actions/showstream.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 65482167e..b83f45d53 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -539,10 +539,16 @@ class ShowstreamAction extends Action function showAnonymousMessage() { - $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . - 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . - '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), - $this->user->nickname, $this->user->nickname); + if (!(common_config('site','closed') || common_config('site','inviteonly'))) { + $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . + 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . + '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), + $this->user->nickname, $this->user->nickname); + } else { + $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . + 'based on the Free Software [Laconica](http://laconi.ca/) tool. '), + $this->user->nickname, $this->user->nickname); + } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); $this->elementEnd('div'); |