Merge branch 'hotfix/4771' into develop

Conflicts: tests/ZendTest/Form/View/Helper/FormRowTest.php
zendframework · Jul 2, 2013 · 43c04a0 · 43c04a0
2 parents 4b43d32 + 4862c47
commit 43c04a0
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
@@ -93,7 +93,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
@@ -397,4 +397,14 @@ public function testCanDisableLabelHtmlEscape()
 
         $this->assertContains($label, $markup);
     }
+
+    public function testCanSetLabelPositionBeforeInvoke()
+    {
+        $element = new Element('foo');
+
+        $this->helper->setLabelPosition('append');
+        $this->helper->__invoke($element);
+
+        $this->assertSame('append', $this->helper->getLabelPosition());
+    }
 }