simplified Form templates as the safeguard is already set in the Form Type

fabpot · fabpot · commit 02f28b6e5e79 · 2011-06-15T16:58:41.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig
@@ -133,7 +133,7 @@
         </div>
     {% else %}
     <select {{ block('attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
-        {% if not multiple and empty_value is not none %}
+        {% if empty_value is not none %}
             <option value="">{{ empty_value|trans }}</option>
         {% endif %}
         {% if preferred_choices|length > 0 %}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
@@ -12,7 +12,7 @@
         <?php if ($read_only): ?> disabled="disabled"<?php endif ?>
         <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
     >
-        <?php if (!$multiple && null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>
+        <?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>
         <?php if (count($preferred_choices) > 0): ?>
             <?php foreach ($preferred_choices as $choice => $label): ?>
                 <?php if ($view['form']->isChoiceGroup($label)): ?>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`<?php if ($read_only): ?> disabled="disabled"<?php endif ?>`
`13`	`13`	`<?php if ($multiple): ?> multiple="multiple"<?php endif ?>`
`14`	`14`	`>`
`15`		`- <?php if (!$multiple && null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>`
	`15`	`+ <?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>`
`16`	`16`	`<?php if (count($preferred_choices) > 0): ?>`
`17`	`17`	`<?php foreach ($preferred_choices as $choice => $label): ?>`
`18`	`18`	`<?php if ($view['form']->isChoiceGroup($label)): ?>`