Merge branch 'testing' into 0.9.x

diff --cc lib/action.php
index 4296ae7dea377a41c10496e7777c0a98639034a8,c4d9fd5cbfec131ecafea08dbe6056c904b7107c..98e5ec2c94e7d89bb0d7472d4d2e0d423ee075f6
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -467,11 -464,11 +467,11 @@@ class Action extends HTMLOutputter // l
                                  _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
                      $this->menuItem(common_local_url('register'),
 +                                    // TRANS: Main menu option when not logged in to register a new account
                                      _m('MENU', 'Register'), $tooltip, false, 'nav_register');
                  }
                  // TRANS: Tooltip for main menu option "Login"