From 6cb4b5dae6f56d0a7201179e72320c2587b5445e Mon Sep 17 00:00:00 2001
From: Glen <glen.84@gmail.com>
Date: Tue, 7 May 2013 20:36:56 +0200
Subject: [PATCH] Fixed unnecessary error rendering in form row helper.

---
 library/Zend/Form/View/Helper/FormRow.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
index c310214b82f..2f66e5afd8a 100644
--- 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) {