summaryrefslogtreecommitdiff
path: root/lib/action.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-03 11:42:02 -0800
committerBrion Vibber <brion@pobox.com>2010-03-03 11:42:02 -0800
commit13521cb510f2377e9b865b0506f92ada9ef9b3cd (patch)
tree253eb64f09ecc821ba273cee88514775495b5f97 /lib/action.php
parente793b5661c2344371a14dfb87b0302a95da5ea48 (diff)
parentccd0db1e0a928fe914c894966ecf2260964a68f0 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/action.php')
-rw-r--r--lib/action.php13
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/action.php b/lib/action.php
index 0918c6858..816086d20 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -420,13 +420,6 @@ class Action extends HTMLOutputter // lawsuit
function showPrimaryNav()
{
$user = common_current_user();
- $connect = '';
- if (common_config('xmpp', 'enabled')) {
- $connect = 'imsettings';
- } else if (common_config('sms', 'enabled')) {
- $connect = 'smssettings';
- }
-
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
$this->element('dt', null, _('Primary site navigation'));
$this->elementStart('dd');
@@ -437,10 +430,8 @@ class Action extends HTMLOutputter // lawsuit
_('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
$this->menuItem(common_local_url('profilesettings'),
_('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
- if ($connect) {
- $this->menuItem(common_local_url($connect),
- _('Connect'), _('Connect to services'), false, 'nav_connect');
- }
+ $this->menuItem(common_local_url('oauthconnectionssettings'),
+ _('Connect'), _('Connect to services'), false, 'nav_connect');
if ($user->hasRight(Right::CONFIGURESITE)) {
$this->menuItem(common_local_url('siteadminpanel'),
_('Admin'), _('Change site configuration'), false, 'nav_admin');