summaryrefslogtreecommitdiff
path: root/actions/public.php
diff options
context:
space:
mode:
authorFederico Marani <federico.marani@ymail.com>2009-03-28 13:52:01 +0000
committerFederico Marani <federico.marani@ymail.com>2009-03-28 13:52:01 +0000
commit4b3f022fc2ff142e6d1cb6740b7f89108cfda292 (patch)
treea7e0f0e6730a02e6a2fc6196bbeabcb1b932baae /actions/public.php
parent420c3613049bec1360cdeb1f50283b239adf23d3 (diff)
parent8c073a34ce472fc8d0385659a222339a5ba4254a (diff)
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts: lib/jabber.php
Diffstat (limited to 'actions/public.php')
-rw-r--r--actions/public.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/actions/public.php b/actions/public.php
index a20ae4032..9b22e0a2c 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -207,9 +207,14 @@ class PublicAction extends Action
function showAnonymousMessage()
{
- $m = _('This is %%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 share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
+ if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
+ $m = _('This is %%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 share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
+ } else {
+ $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
+ 'based on the Free Software [Laconica](http://laconi.ca/) tool.');
+ }
$this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m));
$this->elementEnd('div');