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

---
 lib/action.php  | 2 --
 lib/default.php | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/action.php b/lib/action.php
index a7e0eb33b..0918c6858 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 668206acf..7b50242ae 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' =>
-- 
cgit v1.2.3-54-g00ecf