Skip to content

Commit a430474

Browse files
Merge branch '5.4' into 6.0
* 5.4: (22 commits) Fix composer on appveyor fix bootstrap_3_layout ChoiceType's expanded label_html [PropertyAccess] Fix typo in PropertyAccessor::readProperty() DocBlock [PropertyInfo] PhpStanExtractor namespace missmatch issue [VarExporter] Fix exporting objects with readonly properties [ExpressionLanguage] Fix matches when the regexp is not valid [Messenger] Add mysql indexes back and work around deadlocks using soft-delete Add BC layer to handle old objects already present in cache [RateLimiter] Always store SlidingWindows with an expiration set [Validator] Fix File constraint invalid max size exception message [Console] Fix exit status on uncaught exception with negative code [Validator] fix #43345 @Assert\DivisibleBy [HttpClient] fix 303 after PUT and sending chunked requests [HttpClient] always send Content-Type when a body is passed [HttpClient] always send Content-Length when a body is passed [HttpClient] fix sending Content-Length/Type for POST Fix merge [HttpClient] fix sending PUT requests with curl Fix locales format in CrowdinProvider Fix intersect in TranslatorBag ...
2 parents ef7c0a7 + 3289de4 commit a430474

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,22 @@
101101
{%- endif -%}
102102
{%- endif -%}
103103
<label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
104-
{{- widget|raw }} {{ label is not same as(false) ? (translation_domain is same as(false) ? (label_html is same as(false) ? label : label|raw) : (label_html is same as(false) ? label|trans(label_translation_parameters, translation_domain) : label|trans(label_translation_parameters, translation_domain)|raw)) -}}
104+
{{- widget|raw }}
105+
{%- if label is not same as(false) -%}
106+
{%- if translation_domain is same as(false) -%}
107+
{%- if label_html is same as(false) -%}
108+
{{ label -}}
109+
{%- else -%}
110+
{{ label|raw -}}
111+
{%- endif -%}
112+
{%- else -%}
113+
{%- if label_html is same as(false) -%}
114+
{{ label|trans(label_translation_parameters, translation_domain) -}}
115+
{%- else -%}
116+
{{ label|trans(label_translation_parameters, translation_domain)|raw -}}
117+
{%- endif -%}
118+
{%- endif -%}
119+
{%- endif -%}
105120
</label>
106121
{%- endif -%}
107122
{%- endblock checkbox_radio_label %}

0 commit comments

Comments
 (0)