Remove un-needed config variable for enabling/disabling Twitter integration

diff --git a/lib/action.php b/lib/action.php
index a7e0eb33baa62dcf5594bcc8264b725fc9419733..0918c68582b31cc2c2ff7e9b2d07c6f2c0420a34 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -425,8 +425,6 @@ class Action extends HTMLOutputter // lawsuit
             $connect = 'imsettings';
         } else if (common_config('sms', 'enabled')) {
             $connect = 'smssettings';
-        } else if (common_config('twitter', 'enabled')) {
-            $connect = 'twittersettings';
         }
 
         $this->elementStart('dl', array('id' => 'site_nav_global_primary'));

diff --git a/lib/default.php b/lib/default.php
index 668206acf0f4f14c7ba509d07d19fc150dcf1046..7b50242ae27f9ff5b37996f86348e6d2c7485545 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -177,8 +177,7 @@ $default =
         array('source' => 'StatusNet', # source attribute for Twitter
               'taguri' => null), # base for tag URIs
         'twitter' =>
-        array('enabled' => true,
-              'signin' => true,
+        array('signin' => true,
               'consumer_key' => null,
               'consumer_secret' => null),
         'cache' =>

diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 4266b886d9cae1c9e9162e692de4fe5b9004ba13..8fb81aea0216daed06bb4415bba5e3061da96a50 100644 (file)
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -359,8 +359,6 @@ class FacebookPlugin extends Plugin
             $connect = 'imsettings';
         } else if (common_config('sms', 'enabled')) {
             $connect = 'smssettings';
-        } else if (common_config('twitter', 'enabled')) {
-            $connect = 'twittersettings';
         }
 
         if (!empty($user)) {

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index cd2531fa727a8f3b7d4d2fd41ed645a8f3d4dc7d..f788639aed7383d7b7fe1ca2ec9042c2cc257f07 100644 (file)
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -312,8 +312,6 @@ class MobileProfilePlugin extends WAP20Plugin
             $connect = 'imsettings';
         } else if (common_config('sms', 'enabled')) {
             $connect = 'smssettings';
-        } else if (common_config('twitter', 'enabled')) {
-            $connect = 'twittersettings';
         }
 
         $action->elementStart('ul', array('id' => 'site_nav_global_primary'));