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

2012-12-10 11:08:51 +08:00
parent c91c7fcded f9870842bd
commit 9321379b10
1 changed files with 7 additions and 1 deletions
@@ -101,7 +101,13 @@ class cachestore_addinstance_form extends moodleform {
        }

        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;