integrate local changes with Zach's

darcs-hash:20080916210813-84dde-c2cadb63b09f59ac6c76dc1205a56687de9483ce.gz
2008-09-16 17:08:13 -04:00
parent 219927cb79
commit eb4df223e6
3 changed files with 11 additions and 7 deletions
--- a/lib/common.php
+++ b/lib/common.php
@@ -97,7 +97,13 @@ $config =
 		'daemon' =>
 		array('piddir' => '/var/run',
 			  'user' => false,
-			  'group' => false)
+			  'group' => false),
+		'integration' =>
+		array('source' => 'Laconica'), # source attribute for Twitter
+		'memcached' => 
+		array('enabled' => false,
+			  'server' => 'localhost',
+			  'port' => 11211)
 		);

 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');