diff options
| -rw-r--r-- | actions/login.php | 10 | ||||
| -rw-r--r-- | lib/action.php | 2 |
2 files changed, 8 insertions, 4 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; } } diff --git a/lib/action.php b/lib/action.php index 0fc3a0dc4..c4d9fd5cb 100644 --- a/lib/action.php +++ b/lib/action.php @@ -464,7 +464,7 @@ class Action extends HTMLOutputter // lawsuit _m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); } else { - if (!common_config('site', 'closed')) { + if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { // TRANS: Tooltip for main menu option "Register" $tooltip = _m('TOOLTIP', 'Create an account'); // TRANS: Main menu option when not logged in to register a new account |