eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'jeff-themovie/0.8.x-private-search' into 0.8.x

Browse Source
This commit is contained in:
Craig Andrews 2009-08-11 10:39:44 -04:00
commit b93df1ccbc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@ -184,7 +184,8 @@ function main()
if (!$user && common_config('site', 'private')) { if (!$user && common_config('site', 'private')) {
$public_actions = array('openidlogin', 'finishopenidlogin', $public_actions = array('openidlogin', 'finishopenidlogin',
'recoverpassword', 'api', 'doc'); 'recoverpassword', 'api', 'doc',
'opensearch');
$login_action = 'openidlogin'; $login_action = 'openidlogin';
if (!common_config('site', 'openidonly')) { if (!common_config('site', 'openidonly')) {
$public_actions[] = 'login'; $public_actions[] = 'login';

6
lib/action.php
View File

@ -450,8 +450,10 @@ class Action extends HTMLOutputter // lawsuit
} }
$this->menuItem(common_local_url('doc', array('title' => 'help')), $this->menuItem(common_local_url('doc', array('title' => 'help')),
_('Help'), _('Help me!'), false, 'nav_help'); _('Help'), _('Help me!'), false, 'nav_help');
$this->menuItem(common_local_url('peoplesearch'), if ($user || !common_config('site', 'private')) {
_('Search'), _('Search for people or text'), false, 'nav_search'); $this->menuItem(common_local_url('peoplesearch'),
_('Search'), _('Search for people or text'), false, 'nav_search');
}
Event::handle('EndPrimaryNav', array($this)); Event::handle('EndPrimaryNav', array($this));
} }
$this->elementEnd('ul'); $this->elementEnd('ul');