remove inboxes option

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index f9670cb7f96523c1122ff6b7cbc970e6eb50f67c..9f3d4b1f9d858ea78fb2a8c5c745a5e5f4f3eaa8 100644 (file)
--- 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),