diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-10-11 13:17:59 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-10-11 13:17:59 -0400 |
| commit | 1f21e5ee79a2ce9da3d4d499565ba5412bd3b1f0 (patch) | |
| tree | 03b1cb3bfea6ed1786687a44798af0fe9c4d6448 /lib | |
| parent | e9d7f18f0c2ad05c0203bc347a74c0f69e497566 (diff) | |
| parent | c597aba342c2d4bd7ee53dc471d6b7deafb62a5e (diff) | |
Merge commit 'refs/merge-requests/1738' of git://gitorious.org/statusnet/mainline into 0.8.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/common.php b/lib/common.php index 88d77732f..0b4e03184 100644 --- a/lib/common.php +++ b/lib/common.php @@ -196,15 +196,14 @@ $config = 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, + array('enabled' => true, + 'consumer_key' => null, 'consumer_secret' => null), 'memcached' => array('enabled' => false, |