diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-13 16:45:26 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-13 16:45:26 +0000 |
| commit | 834ac7aa1172518c112bbf90561ead34499e20b8 (patch) | |
| tree | 474dc49eed8ff3542e6d2c8154e14fa4b8432ada /lib/common.php | |
| parent | 18df82ba2302d5b72bc42f4d3296d6fff7d16341 (diff) | |
| parent | 006cfc528edab32548d1265df5dada09a1536aed (diff) | |
Merge branch '0.8.x' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.8.x
Diffstat (limited to 'lib/common.php')
| -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, |