Merge branch 'hotfix/2438' into develop

Forward port #2438
zendframework · Oct 2, 2012 · b243c1c · b243c1c
2 parents b8bd3c9 + be4f91d
commit b243c1c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php
@@ -63,8 +63,8 @@ public function setValueOptions(array $options)
     {
         $this->valueOptions = $options;
 
-        // Update InArray validator haystack
-        if (!is_null($this->validator)) {
+        // Update Explode validator haystack
+        if ($this->validator instanceof ExplodeValidator) {
             $validator = $this->validator->getValidator();
             $validator->setHaystack($this->getValueOptionsValues());
         }

diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
@@ -83,8 +83,17 @@ public function setValueOptions(array $options)
 
         // Update InArrayValidator validator haystack
         if (!is_null($this->validator)) {
-            $validator = $this->validator instanceof InArrayValidator ? $this->validator : $this->validator->getValidator();
-            $validator->setHaystack($this->getValueOptionsValues());
+            if ($this->validator instanceof InArrayValidator){
+                $validator = $this->validator;
+            }
+            if ($this->validator instanceof ExplodeValidator
+                && $this->validator->getValidator() instanceof InArrayValidator
+            ){
+                $validator = $this->validator->getValidator();
+            }
+            if (!empty($validator)){
+                $validator->setHaystack($this->getValueOptionsValues());
+            }
         }
 
         return $this;