Add empty option before empty check

vseager · Oct 25, 2012 · 4b602ad · 4b602ad
1 parent 0abbba9
commit 4b602ad
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/library/Zend/Form/View/Helper/FormSelect.php b/library/Zend/Form/View/Helper/FormSelect.php
@@ -78,17 +78,18 @@ public function render(ElementInterface $element)
         }
 
         $options = $element->getValueOptions();
+
+        if (($emptyOption = $element->getEmptyOption()) !== null) {
+            $options = array('' => $emptyOption) + $options;
+        }
+
         if (empty($options)) {
             throw new Exception\DomainException(sprintf(
                 '%s requires that the element has "value_options"; none found',
                 __METHOD__
             ));
         }
 
-        if (($emptyOption = $element->getEmptyOption()) !== null) {
-            $options = array('' => $emptyOption) + $options;
-        }
-
         $attributes = $element->getAttributes();
         $value      = $this->validateMultiValue($element->getValue(), $attributes);