diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-19 18:47:11 +0200 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-19 18:47:11 +0200 |
| commit | 369885f04f6822355da24595637916e4263db702 (patch) | |
| tree | 4919c5eb718f0df80ffdacab087b11bc8ea16979 /lib | |
| parent | 53650c7a5e8f2a27f8d0d02367bda8934f59c0e6 (diff) | |
| parent | e547a2f54c2a2184d55c57c7712d4d50621f5fc2 (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 |