Merge pull request zendframework#4771 from stefanotorresi/fix/form-ro…

…w-label-position Form\View\Helper\FormRow label position gets overwritten by __invoke()
HolgerW1 · Jul 2, 2013 · 4862c47 · 4862c47
2 parents 28889a5 + 922e659
commit 4862c47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
@@ -92,7 +92,7 @@ public function __invoke(ElementInterface $element = null, $labelPosition = null
 
         if ($labelPosition !== null) {
             $this->setLabelPosition($labelPosition);
-        } else {
+        } elseif ($this->labelPosition === null) {
             $this->setLabelPosition(self::LABEL_PREPEND);
         }
 

diff --git a/tests/ZendTest/Form/View/Helper/FormRowTest.php b/tests/ZendTest/Form/View/Helper/FormRowTest.php
@@ -372,4 +372,14 @@ public function testAssertButtonElementDoesNotRenderLabelTwice()
         $markup = $this->helper->render($element);
         $this->assertRegexp('#^<button type="button" name="button" value=""\/?>foo</button>$#', $markup);
     }
+
+    public function testCanSetLabelPositionBeforeInvoke()
+    {
+        $element = new Element('foo');
+
+        $this->helper->setLabelPosition('append');
+        $this->helper->__invoke($element);
+
+        $this->assertSame('append', $this->helper->getLabelPosition());
+    }
 }