From eb4df223e6bb63c4a81e744c74b2f7fae335a8a0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 16 Sep 2008 17:08:13 -0400 Subject: integrate local changes with Zach's darcs-hash:20080916210813-84dde-c2cadb63b09f59ac6c76dc1205a56687de9483ce.gz --- lib/common.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/common.php') diff --git a/lib/common.php b/lib/common.php index 8ea8fa0fa..71a75ff10 100644 --- 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'); -- cgit v1.2.3-54-g00ecf