summaryrefslogtreecommitdiff
path: root/lib/action.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-19 18:47:56 +0200
committerBrion Vibber <brion@pobox.com>2010-04-19 18:47:56 +0200
commitfee6b78e2896705b831fc98025581405e3e21e27 (patch)
tree8fe8407b2749198346040a88831058da9bc1acf3 /lib/action.php
parent83edc126c04c544a577675507e0ca01ca5c2e665 (diff)
parent369885f04f6822355da24595637916e4263db702 (diff)
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'lib/action.php')
-rw-r--r--lib/action.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php
index 4296ae7de..98e5ec2c9 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -467,7 +467,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');
$this->menuItem(common_local_url('register'),