Merge branch 'twitter-oauth' into 0.8.x

Conflicts: scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
parent c1b19929f6 06c5f490ea
commit 17dcf1c317
14 changed files with 1384 additions and 893 deletions
--- a/lib/common.php
+++ b/lib/common.php
@@ -194,6 +194,9 @@ $config =
        'integration' =>
        array('source' => 'Laconica', # source attribute for Twitter
              'taguri' => $_server.',2009'), # base for tag URIs
+	'twitter' =>
+	array('consumer_key'    => null,
+	      'consumer_secret' => null),
        'memcached' =>
        array('enabled' => false,
              'server' => 'localhost',