Merge branch 'wip-MDL-36939-m25' of git://github.com/samhemelryk/moodle

moodle · Dec 10, 2012 · 7689a58 · 7689a58
2 parents 845774b + 7d18285
commit 7689a58
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/cache/forms.php b/cache/forms.php
@@ -101,7 +101,13 @@ public function validation($data, $files) {
         }
 
         if (method_exists($this, 'configuration_validation')) {
-            $errors = $this->configuration_validation($data, $files);
+            $newerrors = $this->configuration_validation($data, $files, $errors);
+            // We need to selectiviliy merge here
+            foreach ($newerrors as $element => $error) {
+                if (!array_key_exists($element, $errors)) {
+                    $errors[$element] = $error;
+                }
+            }
         }
 
         return $errors;