From 6671b32285c0e0f704cd90f176062f04c008e99e Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Mon, 22 Apr 2013 16:22:02 +0200
Subject: [PATCH] [Form] Fixed missing label in button

---
 .../Resources/views/Form/button_widget.html.php               | 4 +---
 src/Symfony/Component/Form/Tests/AbstractLayoutTest.php       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
index 4f78927382..64d4466688 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
@@ -1,4 +1,2 @@
 <?php if (!$label) { $label = $view['form']->humanize($name); } ?>
-<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>>
-    <?php $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?>
-</button>
+<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></button>
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 9f8200c095..358f4efdcd 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -1769,7 +1769,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
         $form = $this->factory->createNamed('name', 'button');
 
         $this->assertWidgetMatchesXpath($form->createView(), array(),
-            '/button[@type="button"][@name="name"]'
+            '/button[@type="button"][@name="name"][.="[trans]Name[/trans]"]'
         );
     }