X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdefault.php;h=9f3d4b1f9d858ea78fb2a8c5c745a5e5f4f3eaa8;hb=4f5badda94071d9debc8dacfbc9072be3c2ee73d;hp=f9670cb7f96523c1122ff6b7cbc970e6eb50f67c;hpb=b3bbaecf47d74102a2ed48cd0c773d33a4a49d59;p=quix0rs-gnu-social.git

diff --git a/lib/default.php b/lib/default.php
index f9670cb7f9..9f3d4b1f9d 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,16 +140,15 @@ $default =
         array('enabled' => true),
         'sms' =>
         array('enabled' => true),
-        'twitter' =>
-        array('enabled' => true),
         'twitterbridge' =>
         array('enabled' => false),
         'integration' =>
         array('source' => 'StatusNet', # source attribute for Twitter
               'taguri' => $_server.',2009'), # base for tag URIs
 	'twitter' =>
-	array('consumer_key'    => null,
-	      'consumer_secret' => null),
+	array('enabled'       => true,
+	    'consumer_key'    => null,
+	    'consumer_secret' => null),
         'memcached' =>
         array('enabled' => false,
               'server' => 'localhost',
@@ -158,7 +157,7 @@ $default =
  		'ping' =>
         array('notify' => array()),
         'inboxes' =>
-        array('enabled' => true), # on by default for new sites
+        array('enabled' => true), # ignored after 0.9.x
         'newuser' =>
         array('default' => null,
               'welcome' => null),