Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / lib / statusnet.php

diff --git a/lib/statusnet.php b/lib/statusnet.php
index afb8f5af02f4ad830d496c633dbfd61ef7a17caf..776cfb579b807f70c069e38416025b77779e637b 100644 (file)
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -341,11 +341,7 @@ class StatusNet
         // Backwards compatibility
         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'])) {