From acd81f6c694373a18a0ee9ba29075b9924603c25 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@owncloud.com>
Date: Fri, 10 Jan 2014 00:57:40 +0100
Subject: [PATCH] Readd support for memcached_server config variable.
---
lib/private/memcache/memcached.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index 13b1867231..075828eeba 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -18,7 +18,15 @@ class Memcached extends Cache {
parent::__construct($prefix);
if (is_null(self::$cache)) {
self::$cache = new \Memcached();
- $servers = \OC_Config::getValue('memcached_servers', array(array('localhost', 11211)));
+ $servers = \OC_Config::getValue('memcached_servers');
+ if (!$servers) {
+ $server = \OC_Config::getValue('memcached_server');
+ if ($server) {
+ $servers = array($server);
+ } else {
+ $servers = array(array('localhost', 11211));
+ }
+ }
self::$cache->addServers($servers);
}
}
--
GitLab