Don't switch people from the Memcache to Memcached plugin without their knowledge...

New installations should be using addPlugin explicitly.

diff --git a/lib/statusnet.php b/lib/statusnet.php
index ef3adebf94fdf4bbc9223bc6a2d9435bf79e6411..eba9ab9b8eef799f20567efa82cb905e6fa420bd 100644 (file)
--- 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'])) {