summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-03 10:19:14 -0800
committerZach Copley <zach@status.net>2010-03-03 10:19:14 -0800
commit61ada4558d69901c71b6542c16d43b5ea75ea3b3 (patch)
treeae82d976102aed9835c8e3ab2d9666e056d9e5bd /lib
parentf3cea2430497e751bc7776fe3abf0603e2b55f8b (diff)
Fix for disappearing 'connect' menu if xmpp and sms are disabled.
All 'connect' menu panels used to be optional, so Action tried to figure out what the first item on the 'connect' menu should be. This is no longer necessary because we have the non-optional OAuth client connections panel now, which is not optional and can't be turned off.
Diffstat (limited to 'lib')
-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');