From 705891f9bef09b59d957a4fbd48c1bab3e025942 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 1 Mar 2010 21:52:31 -0800
Subject: [PATCH] Remove un-needed config variable for enabling/disabling
 Twitter integration

---
 lib/action.php                                | 2 --
 lib/default.php                               | 3 +--
 plugins/Facebook/FacebookPlugin.php           | 2 --
 plugins/MobileProfile/MobileProfilePlugin.php | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index fa9ddb9110..94b1fa5358 100644
--- 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 668206acf0..7b50242ae2 100644
--- 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 4266b886d9..8fb81aea02 100644
--- 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 cd2531fa72..f788639aed 100644
--- 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'));