Skip to content

Commit 9574613

Browse files
Merge branch '3.4' into 4.3
* 3.4: [Debug] fix ClassNotFoundFatalErrorHandler [Dotenv] Fixed infinite loop with missing quote followed by quoted value [TwigBridge] button_widget now has its title attr translated even if its label = null or false [PhpUnitBridge] When using phpenv + phpenv-composer plugin, composer executable is wrapped into a bash script [Security] Prevent canceled remember-me cookie from being accepted [FrameworkBundle][TranslationUpdateCommand] Do not output positive feedback on stderr
2 parents a1c112b + 1d1372c commit 9574613

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Resources/views/Form/form_div_layout.html.twig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,11 @@
226226
'%name%': name,
227227
'%id%': id,
228228
}) %}
229-
{%- elseif label is same as(false) -%}
230-
{% set translation_domain = false %}
231-
{%- else -%}
229+
{%- elseif label is not same as(false) -%}
232230
{% set label = name|humanize %}
233231
{%- endif -%}
234232
{%- endif -%}
235-
<button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain) }}</button>
233+
<button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as(false) or label is same as(false) ? label : label|trans(label_translation_parameters, translation_domain) }}</button>
236234
{%- endblock button_widget -%}
237235

238236
{%- block submit_widget -%}

0 commit comments

Comments
 (0)