From: Brion Vibber <brion@pobox.com>
Date: Fri, 12 Mar 2010 02:10:41 +0000 (-0800)
Subject: Don't switch people from the Memcache to Memcached plugin without their knowledge... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b1d90a835f414532ea318ef39e9d1fc8c816805e;p=quix0rs-gnu-social.git

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.
---

diff --git a/lib/statusnet.php b/lib/statusnet.php
index ef3adebf94..eba9ab9b8e 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'])) {