summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/searchaction.php22
-rw-r--r--lib/settingsaction.php50
2 files changed, 36 insertions, 36 deletions
diff --git a/lib/searchaction.php b/lib/searchaction.php
index c0eab7d24..f99883b25 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -94,17 +94,17 @@ class SearchAction extends Action {
function search_menu() {
# action => array('prompt', 'title', $args)
$action = $this->trimmed('action');
- $menu =
- array('peoplesearch' =>
- array(
- _('People'),
- _('Find people on this site'),
- ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
- 'noticesearch' =>
- array( _('Text'),
- _('Find content of notices'),
- ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
- );
+ $menu =
+ array('peoplesearch' =>
+ array(
+ _('People'),
+ _('Find people on this site'),
+ ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
+ 'noticesearch' =>
+ array( _('Text'),
+ _('Find content of notices'),
+ ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
+ );
$this->nav_menu($menu);
}
}
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index a71c9e9bc..33fec0f1d 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -79,35 +79,35 @@ class SettingsAction extends Action {
function settings_menu() {
# action => array('prompt', 'title')
- static $menu =
- array('profilesettings' =>
- array('Profile',
- 'Change your profile settings'),
- 'emailsettings' =>
- array('Email',
- 'Change email handling'),
- 'avatar' =>
- array('Avatar',
- 'Upload a new profile image'),
- 'password' =>
- array('Password',
- 'Change your password'),
- 'openidsettings' =>
- array('OpenID',
- 'Add or remove OpenIDs'),
- 'smssettings' =>
- array('SMS',
- 'Updates by SMS'),
- 'imsettings' =>
- array('IM',
- 'Updates by instant messenger (IM)'));
-
+ $menu =
+ array('profilesettings' =>
+ array(_('Profile'),
+ _('Change your profile settings')),
+ 'emailsettings' =>
+ array(_('Email'),
+ _('Change email handling')),
+ 'avatar' =>
+ array(_('Avatar'),
+ _('Upload a new profile image')),
+ 'password' =>
+ array(_('Password'),
+ _('Change your password')),
+ 'openidsettings' =>
+ array(_('OpenID'),
+ _('Add or remove OpenIDs')),
+ 'smssettings' =>
+ array(_('SMS'),
+ _('Updates by SMS')),
+ 'imsettings' =>
+ array(_('IM'),
+ _('Updates by instant messenger (IM)')));
+
$action = $this->trimmed('action');
common_element_start('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) {
common_menu_item(common_local_url($menuaction),
- _($menudesc[0]),
- _($menudesc[1]),
+ $menudesc[0],
+ $menudesc[1],
$action == $menuaction);
}
common_element_end('ul');