summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-01 21:52:31 -0800
committerZach Copley <zach@status.net>2010-03-01 21:52:31 -0800
commit871b3aa6c00b38e1782949e201e5cbca7fb7a524 (patch)
treeb74e8bb365e88f36938c862c465fde2e60fa1bb2
parent6b2d67216ef7d550921f813981f7744d1687be78 (diff)
Remove un-needed config variable for enabling/disabling Twitter integration
-rw-r--r--lib/action.php2
-rw-r--r--lib/default.php3
-rw-r--r--plugins/Facebook/FacebookPlugin.php2
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php2
4 files changed, 1 insertions, 8 deletions
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' =>
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 4266b886d..8fb81aea0 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 cd2531fa7..f788639ae 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'));