Fix ticket #2289: registration links were showing in top nav bar, login page message...

diff --git a/actions/login.php b/actions/login.php
index 8ea3c800b70f72d1915dd497e0d4fe76d14bf728..dc6352368a698e0753619bdb9827df4b555585d9 100644 (file)
--- 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 0fc3a0dc435cd537bd647e2468ee3fcda13335a5..c4d9fd5cbfec131ecafea08dbe6056c904b7107c 100644 (file)
--- 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