<span>$label</span> only when filled

patrioticcow · Sep 20, 2012 · 984e30c · 984e30c
1 parent afac243
commit 984e30c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
@@ -121,13 +121,17 @@ public function render(ElementInterface $element)
                     $labelClose = $labelHelper->closeTag();
                 }
 
+                if (!empty($label)) {
+                    $label = '<span>' . $label . '</span>';
+                }
+
                 switch ($this->labelPosition) {
                     case self::LABEL_PREPEND:
-                        $markup = $labelOpen . '<span>' . $label . '</span>' . $elementString . $labelClose;
+                        $markup = $labelOpen . $label . $elementString . $labelClose;
                         break;
                     case self::LABEL_APPEND:
                     default:
-                        $markup = $labelOpen . $elementString . '<span>' . $label . '</span>' . $labelClose;
+                        $markup = $labelOpen . $elementString . $label . $labelClose;
                         break;
                 }