From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 11 Oct 2009 17:17:59 +0000 (-0400)
Subject: Merge commit 'refs/merge-requests/1738' of git://gitorious.org/statusnet/mainline... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f21e5ee79a2ce9da3d4d499565ba5412bd3b1f0;p=quix0rs-gnu-social.git

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

1f21e5ee79a2ce9da3d4d499565ba5412bd3b1f0
diff --cc plugins/FBConnect/FBConnectPlugin.php
index cb19b05461,950718a33c..ff74aade45
--- a/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;
      }