summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.php3
-rw-r--r--lib/action.php6
2 files changed, 6 insertions, 3 deletions
diff --git a/index.php b/index.php
index 980b9881b..214f92245 100644
--- a/index.php
+++ b/index.php
@@ -184,7 +184,8 @@ function main()
if (!$user && common_config('site', 'private')) {
$public_actions = array('openidlogin', 'finishopenidlogin',
- 'recoverpassword', 'api', 'doc');
+ 'recoverpassword', 'api', 'doc',
+ 'opensearch');
$login_action = 'openidlogin';
if (!common_config('site', 'openidonly')) {
$public_actions[] = 'login';
diff --git a/lib/action.php b/lib/action.php
index 6da9adab5..1bdc4daea 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -450,8 +450,10 @@ class Action extends HTMLOutputter // lawsuit
}
$this->menuItem(common_local_url('doc', array('title' => 'help')),
_('Help'), _('Help me!'), false, 'nav_help');
- $this->menuItem(common_local_url('peoplesearch'),
- _('Search'), _('Search for people or text'), false, 'nav_search');
+ if ($user || !common_config('site', 'private')) {
+ $this->menuItem(common_local_url('peoplesearch'),
+ _('Search'), _('Search for people or text'), false, 'nav_search');
+ }
Event::handle('EndPrimaryNav', array($this));
}
$this->elementEnd('ul');