diff options
| author | Brenda Wallace <shiny@cpan.org> | 2010-03-10 20:47:49 +1300 |
|---|---|---|
| committer | Brenda Wallace <shiny@cpan.org> | 2010-03-10 20:47:49 +1300 |
| commit | 47034553fea0ad760596eae416a675b93dd9380c (patch) | |
| tree | c6750d642cfd5d71b331e4ed7bce29247f1277d6 /lib/statusnet.php | |
| parent | c89ed16d24d56879bf40a70d500509d1d42a4532 (diff) | |
| parent | 9653cb9f0a590417245063f905a2089f03b9e7b2 (diff) | |
Merge commit 'mainline/0.9.x' into 0.9.x
Diffstat (limited to 'lib/statusnet.php')
| -rw-r--r-- | lib/statusnet.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/statusnet.php b/lib/statusnet.php index eba9ab9b8..ef3adebf9 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -342,7 +342,11 @@ class StatusNet if (array_key_exists('memcached', $config)) { if ($config['memcached']['enabled']) { - addPlugin('Memcache', array('servers' => $config['memcached']['server'])); + if(class_exists('Memcached')) { + addPlugin('Memcached', array('servers' => $config['memcached']['server'])); + } else { + addPlugin('Memcache', array('servers' => $config['memcached']['server'])); + } } if (!empty($config['memcached']['base'])) { |