MDL-42071 caching Validate setservers correctly for php pre 5.5

roddle · Jul 2, 2014 · 9043a10 · 9043a10
1 parent cd230b3
commit 9043a10
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cache/stores/memcache/addinstanceform.php b/cache/stores/memcache/addinstanceform.php
@@ -77,8 +77,13 @@ public function validation($data, $files) {
 
         if (isset($data['clustered']) && ($data['clustered'] == 1)) {
             // Set servers is required with in cluster mode.
-            if (!isset($data['setservers']) || empty(trim($data['setservers']))) {
+            if (!isset($data['setservers'])) {
                 $errors['setservers'] = get_string('required');
+            } else {
+                $trimmed = trim($data['setservers']);
+                if (empty($trimmed)) {
+                    $errors['setservers'] = get_string('required');
+                }
             }
 
             $validservers = false;

diff --git a/cache/stores/memcached/addinstanceform.php b/cache/stores/memcached/addinstanceform.php
@@ -99,8 +99,13 @@ public function validation($data, $files) {
 
         if (isset($data['clustered']) && ($data['clustered'] == 1)) {
             // Set servers is required with in cluster mode.
-            if (!isset($data['setservers']) || empty(trim($data['setservers']))) {
+            if (!isset($data['setservers'])) {
                 $errors['setservers'] = get_string('required');
+            } else {
+                $trimmed = trim($data['setservers']);
+                if (empty($trimmed)) {
+                    $errors['setservers'] = get_string('required');
+                }
             }
 
             $validservers = false;