diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-13 17:21:41 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-13 17:21:41 -0400 |
| commit | 181de862efe2da16164daea32b74c3da8ea2ed7e (patch) | |
| tree | 8e7ebfc731f7e65f26b3b71d65c28bbe51ac2c85 /lib/default.php | |
| parent | 76ac7c358a3245f4032f49152055cae94c4616ff (diff) | |
| parent | 659a04b556f75551548c0b2fff633b15cd114135 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/default.php b/lib/default.php index f9670cb7f..329b041e9 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', |