diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-12 11:10:06 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-12 11:10:06 -0700 |
| commit | 712db3a89741c423f91f43bcbeb2650d5d5d5205 (patch) | |
| tree | ef260a2b132405013025f61930c3850f498318c9 /lib/default.php | |
| parent | 3f27f3138e88b8e52bd88ced381ea1bd5e70da89 (diff) | |
| parent | f719720e8ad3b09d664e33172bafef2b0fb91eea (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', |