Merge pull request #155 from nathansbraten/master

Fixes usage of label option on button elements.
neilime · Aug 17, 2015 · 6e9ea42 · 6e9ea42
2 parents 234cede + a33441c
commit 6e9ea42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/TwbBundle/Form/View/Helper/TwbBundleFormButton.php b/src/TwbBundle/Form/View/Helper/TwbBundleFormButton.php
@@ -87,10 +87,10 @@ public function render(ElementInterface $oElement, $sButtonContent = null)
          * Define button content
          */
         if (null === $sButtonContent) {
-            $sButtonContent = $oElement->getValue();
+            $sButtonContent = $oElement->getLabel();
 
             if (!$sButtonContent) {
-                $sButtonContent = $oElement->getLabel();
+                $sButtonContent = $oElement->getValue();
             }
 
             if (null === $sButtonContent && !$aIconOptions) {