summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-30 14:57:19 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-30 14:57:19 -0700
commit907b5f7b406d87c438a560e04385318662163755 (patch)
tree5e1a7695f7078d9fe101a73648438c2183d5575a
parent4405648afb3417baa1cf3808fb91cf979a76b553 (diff)
parent4450f3352c4dafcbe132146873ef9fad251d9714 (diff)
Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
* commit 'erichelgeson/no-posts-verbage': Needed the else. Tested logged in/out ; site closed/inviteonly/both Verbage of a closed invite only site, it shouldnt ask you to register.
-rw-r--r--actions/public.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/public.php b/actions/public.php
index 9851285c4..ef9ef0d1a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -182,8 +182,10 @@ class PublicAction extends Action
$message .= _('Be the first to post!');
}
else {
- $message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
- }
+ if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
+ $message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
+ }
+ }
$this->elementStart('div', 'guide');
$this->raw(common_markup_to_html($message));