Merge branch 'hotfix/4441'

Close #4441
zendframework · May 9, 2013 · 3af6f8c · 3af6f8c
2 parents 67ba034 + ccaf530
commit 3af6f8c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
@@ -121,7 +121,6 @@ public function render(ElementInterface $element)
 
         $label           = $element->getLabel();
         $inputErrorClass = $this->getInputErrorClass();
-        $elementErrors   = $elementErrorsHelper->render($element);
 
         if (isset($label) && '' !== $label) {
             // Translate the label
@@ -133,7 +132,7 @@ public function render(ElementInterface $element)
         }
 
         // Does this element have errors ?
-        if (!empty($elementErrors) && !empty($inputErrorClass)) {
+        if (count($element->getMessages()) > 0 && !empty($inputErrorClass)) {
             $classAttributes = ($element->hasAttribute('class') ? $element->getAttribute('class') . ' ' : '');
             $classAttributes = $classAttributes . $inputErrorClass;
 
@@ -152,6 +151,10 @@ public function render(ElementInterface $element)
             return $this->view->render($this->partial, $vars);
         }
 
+        if ($this->renderErrors) {
+            $elementErrors = $elementErrorsHelper->render($element);
+        }
+
         $elementString = $elementHelper->render($element);
 
         if (isset($label) && '' !== $label) {