Skip to content

Commit d5f3e83

Browse files
Merge branch '4.3' into 4.4
* 4.3: [Debug] fix ClassNotFoundFatalErrorHandler [Routing] Fix using a custom matcher & generator dumper class [Dotenv] Fixed infinite loop with missing quote followed by quoted value [HttpClient] Added missing sprintf [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 [Messenger] Added check if json_encode succeeded [Security] Prevent canceled remember-me cookie from being accepted [FrameworkBundle][TranslationUpdateCommand] Do not output positive feedback on stderr [Security\Guard] Fix missing typehints
2 parents 87b7a70 + 9574613 commit d5f3e83

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
@@ -228,13 +228,11 @@
228228
'%name%': name,
229229
'%id%': id,
230230
}) %}
231-
{%- elseif label is same as(false) -%}
232-
{% set translation_domain = false %}
233-
{%- else -%}
231+
{%- elseif label is not same as(false) -%}
234232
{% set label = name|humanize %}
235233
{%- endif -%}
236234
{%- endif -%}
237-
<button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain) }}</button>
235+
<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>
238236
{%- endblock button_widget -%}
239237

240238
{%- block submit_widget -%}

0 commit comments

Comments
 (0)