summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-19 18:47:11 +0200
committerBrion Vibber <brion@pobox.com>2010-04-19 18:47:11 +0200
commit369885f04f6822355da24595637916e4263db702 (patch)
tree4919c5eb718f0df80ffdacab087b11bc8ea16979 /actions
parent53650c7a5e8f2a27f8d0d02367bda8934f59c0e6 (diff)
parente547a2f54c2a2184d55c57c7712d4d50621f5fc2 (diff)
Merge branch 'master' into testing
Diffstat (limited to 'actions')
-rw-r--r--actions/login.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/actions/login.php b/actions/login.php
index 8ea3c800b..dc6352368 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -267,9 +267,13 @@ class LoginAction extends Action
'user name and password ' .
'before changing your settings.');
} else {
- return _('Login with your username and password. ' .
- 'Don\'t have a username yet? ' .
- '[Register](%%action.register%%) a new account.');
+ $prompt = _('Login with your username and password.');
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+ $prompt .= ' ';
+ $prompt .= _('Don\'t have a username yet? ' .
+ '[Register](%%action.register%%) a new account.');
+ }
+ return $prompt;
}
}