Merge commit 'refs/merge-requests/1738' of git://gitorious.org/statusnet/mainline...

diff --cc plugins/FBConnect/FBConnectPlugin.php
index cb19b054610abb9f8961a3e88b6e0ba727678215,950718a33c313b3202456b65281b100c338d4ceb..ff74aade45b9301b1934afc45392dd207fc4151a
--- 1/plugins/FBConnect/FBConnectPlugin.php
--- 2/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@@ -310,14 -318,11 +318,16 @@@ class FBConnectPlugin extends Plugi
  
           $action->menuItem(common_local_url('doc', array('title' => 'help')),
               _('Help'), _('Help me!'), false, 'nav_help');
-          $action->menuItem(common_local_url('peoplesearch'),
-              _('Search'), _('Search for people or text'), false, 'nav_search');
+          if ($user || !common_config('site', 'private')) {
+              $action->menuItem(common_local_url('peoplesearch'),
+                  _('Search'), _('Search for people or text'), false, 'nav_search');
+          }
  
 +        // We are replacing the primary nav entirely; give other
 +        // plugins a chance to handle it here.
 +
 +        Event::handle('EndPrimaryNav', array($action));
 +
          return false;
      }