From 61ada4558d69901c71b6542c16d43b5ea75ea3b3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 3 Mar 2010 10:19:14 -0800
Subject: [PATCH] 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.

---
 lib/action.php                                | 13 ++-----------
 plugins/Facebook/FacebookPlugin.php           | 10 ----------
 plugins/MobileProfile/MobileProfilePlugin.php | 11 +----------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 0918c68582..816086d202 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');
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 90ed7351f3..65d4409b5e 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -436,16 +436,7 @@ class FacebookPlugin extends Plugin
     function onStartPrimaryNav($action)
     {
         if (self::hasKeys()) {
-
             $user = common_current_user();
-
-            $connect = 'FBConnectSettings';
-            if (common_config('xmpp', 'enabled')) {
-                $connect = 'imsettings';
-            } else if (common_config('sms', 'enabled')) {
-                $connect = 'smssettings';
-            }
-
             if (!empty($user)) {
 
                 $fbuid = $this->loggedIn();
@@ -472,7 +463,6 @@ class FacebookPlugin extends Plugin
                         'src' => $iconurl));
 
                     $action->elementEnd('li');
-
                 }
             }
         }
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index f788639aed..0b37734b7d 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -307,23 +307,14 @@ class MobileProfilePlugin extends WAP20Plugin
     function _showPrimaryNav($action)
     {
         $user    = common_current_user();
-        $connect = '';
-        if (common_config('xmpp', 'enabled')) {
-            $connect = 'imsettings';
-        } else if (common_config('sms', 'enabled')) {
-            $connect = 'smssettings';
-        }
-
         $action->elementStart('ul', array('id' => 'site_nav_global_primary'));
         if ($user) {
             $action->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
                             _('Home'));
             $action->menuItem(common_local_url('profilesettings'),
                             _('Account'));
-            if ($connect) {
-                $action->menuItem(common_local_url($connect),
+            $action->menuItem(common_local_url('oauthconnectionssettings'),
                                 _('Connect'));
-            }
             if ($user->hasRight(Right::CONFIGURESITE)) {
                 $action->menuItem(common_local_url('siteadminpanel'),
                                 _('Admin'), _('Change site configuration'), false, 'nav_admin');