Permalink
Browse files

Merge branch 'wip-MDL-36939-m24' of git://github.com/samhemelryk/mood…

…le into MOODLE_24_STABLE
  • Loading branch information...
2 parents c91c7fc + f987084 commit 9321379b100ef2860d7a9eddfd28abfb0da55595 @danpoltawski danpoltawski committed Dec 10, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 cache/forms.php
View
@@ -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;

0 comments on commit 9321379

Please sign in to comment.