From e75becf3b3e14ecc9ab1bd3185dece355741e867 Mon Sep 17 00:00:00 2001
From: Eric Merrill <merrill@oakland.edu>
Date: Wed, 13 Aug 2014 08:24:04 -0400
Subject: [PATCH] MDL-46796 caching: Fix missing property error for memcache(d)

---
 cache/stores/memcache/lib.php  | 28 ++++++++++++++--------------
 cache/stores/memcached/lib.php | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/cache/stores/memcache/lib.php b/cache/stores/memcache/lib.php
index aa5c15d0827..4cedf017c5c 100644
--- a/cache/stores/memcache/lib.php
+++ b/cache/stores/memcache/lib.php
@@ -435,24 +435,24 @@ class cachestore_memcache extends cache_store implements cache_is_configurable {
         }
 
         $clustered = false;
+        $setservers = array();
         if (isset($data->clustered)) {
             $clustered = true;
-        }
 
-        $lines = explode("\n", $data->setservers);
-        $setservers = array();
-        foreach ($lines as $line) {
-            // Trim surrounding colons and default whitespace.
-            $line = trim(trim($line), ":");
-            if ($line === '') {
-                continue;
+            $lines = explode("\n", $data->setservers);
+            foreach ($lines as $line) {
+                // Trim surrounding colons and default whitespace.
+                $line = trim(trim($line), ":");
+                if ($line === '') {
+                    continue;
+                }
+                $setserver = explode(':', $line, 3);
+                // We don't use weights, so display a debug message.
+                if (count($setserver) > 2) {
+                    debugging('Memcache Set Server '.$setserver[0].' has too many parameters.');
+                }
+                $setservers[] = $setserver;
             }
-            $setserver = explode(':', $line, 3);
-            // We don't use weights, so display a debug message.
-            if (count($setserver) > 2) {
-                debugging('Memcache Set Server '.$setserver[0].' has too many parameters.');
-            }
-            $setservers[] = $setserver;
         }
 
         return array(
diff --git a/cache/stores/memcached/lib.php b/cache/stores/memcached/lib.php
index b379b263e45..f75d8c5f920 100644
--- a/cache/stores/memcached/lib.php
+++ b/cache/stores/memcached/lib.php
@@ -491,24 +491,24 @@ class cachestore_memcached extends cache_store implements cache_is_configurable
         }
 
         $clustered = false;
+        $setservers = array();
         if (isset($data->clustered)) {
             $clustered = true;
-        }
 
-        $lines = explode("\n", $data->setservers);
-        $setservers = array();
-        foreach ($lines as $line) {
-            // Trim surrounding colons and default whitespace.
-            $line = trim(trim($line), ":");
-            if ($line === '') {
-                continue;
+            $lines = explode("\n", $data->setservers);
+            foreach ($lines as $line) {
+                // Trim surrounding colons and default whitespace.
+                $line = trim(trim($line), ":");
+                if ($line === '') {
+                    continue;
+                }
+                $setserver = explode(':', $line, 3);
+                // We don't use weights, so display a debug message.
+                if (count($setserver) > 2) {
+                    debugging('Memcached Set Server '.$setserver[0].' has too many parameters.');
+                }
+                $setservers[] = $setserver;
             }
-            $setserver = explode(':', $line, 3);
-            // We don't use weights, so display a debug message.
-            if (count($setserver) > 2) {
-                debugging('Memcached Set Server '.$setserver[0].' has too many parameters.');
-            }
-            $setservers[] = $setserver;
         }
 
         return array(