Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

2 files changed, 1 insertions, 20 deletions

diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 90ed7351f..65d4409b5 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 f788639ae..0b37734b7 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');