diff options
| author | Zach Copley <zach@status.net> | 2010-10-20 17:28:28 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-10-20 17:28:28 -0700 |
| commit | bfdb8385ecc745002b8c45510caf2fdf7c2d2c9f (patch) | |
| tree | 392196b097fafb10430bb7db763fd744a0639bf3 /lib/action.php | |
| parent | e56385a7bb25336a72c1d37ad43d51ba8e238231 (diff) | |
| parent | 31f52ec37c5a2be76c197a9c492d3a236af045cd (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/action.php b/lib/action.php index 55ee83bde..3d7d1d808 100644 --- a/lib/action.php +++ b/lib/action.php @@ -419,8 +419,9 @@ class Action extends HTMLOutputter // lawsuit 'class' => 'vcard')); if (Event::handle('StartAddressData', array($this))) { if (common_config('singleuser', 'enabled')) { + $user = User::singleUser(); $url = common_local_url('showstream', - array('nickname' => common_config('singleuser', 'nickname'))); + array('nickname' => $user->nickname)); } else { $url = common_local_url('public'); } @@ -526,20 +527,20 @@ class Action extends HTMLOutputter // lawsuit } // TRANS: Tooltip for main menu option "Login" $tooltip = _m('TOOLTIP', 'Login to the site'); - // TRANS: Main menu option when not logged in to log in $this->menuItem(common_local_url('login'), + // TRANS: Main menu option when not logged in to log in _m('MENU', 'Login'), $tooltip, false, 'nav_login'); } // TRANS: Tooltip for main menu option "Help" $tooltip = _m('TOOLTIP', 'Help me!'); - // TRANS: Main menu option for help on the StatusNet site $this->menuItem(common_local_url('doc', array('title' => 'help')), + // TRANS: Main menu option for help on the StatusNet site _m('MENU', 'Help'), $tooltip, false, 'nav_help'); if ($user || !common_config('site', 'private')) { // TRANS: Tooltip for main menu option "Search" $tooltip = _m('TOOLTIP', 'Search for people or text'); - // TRANS: Main menu option when logged in or when the StatusNet instance is not private $this->menuItem(common_local_url('peoplesearch'), + // TRANS: Main menu option when logged in or when the StatusNet instance is not private _m('MENU', 'Search'), $tooltip, false, 'nav_search'); } Event::handle('EndPrimaryNav', array($this)); |