summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-11 18:10:41 -0800
committerBrion Vibber <brion@pobox.com>2010-03-11 18:10:41 -0800
commitb1d90a835f414532ea318ef39e9d1fc8c816805e (patch)
treefd9d5765fc955c40e3069514fb601c65f31f256c /lib
parentfe7b063b85647264f1988fba966502a1b0287511 (diff)
Don't switch people from the Memcache to Memcached plugin without their knowledge when using back-compatibility $config['memcached']['enabled']. Performance characteristics for Memcached version on large-scale sites not tested yet.
New installations should be using addPlugin explicitly.
Diffstat (limited to 'lib')
-rw-r--r--lib/statusnet.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/statusnet.php b/lib/statusnet.php
index ef3adebf9..eba9ab9b8 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -342,11 +342,7 @@ class StatusNet
if (array_key_exists('memcached', $config)) {
if ($config['memcached']['enabled']) {
- if(class_exists('Memcached')) {
- addPlugin('Memcached', array('servers' => $config['memcached']['server']));
- } else {
- addPlugin('Memcache', array('servers' => $config['memcached']['server']));
- }
+ addPlugin('Memcache', array('servers' => $config['memcached']['server']));
}
if (!empty($config['memcached']['base'])) {