Skip to content

Commit 815e39f

Browse files
Merge branch '6.2' into 6.3
* 6.2: [Translation] Fix merge [SecurityBundle] Fix `Security::login()` on specific firewall [MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 deprecation when no user agent is set [Form] Skip password hashing on empty password Update Redis version to 6.2.8 [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait [Messenger][Cache] fixed CallbackInterface support in async expiration handler do not drop embed label classes
2 parents 3a4755f + 40bd85d commit 815e39f

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
{%- if required -%}
9191
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
9292
{%- endif -%}
93+
{%- if parent_label_class is defined -%}
94+
{% set embed_label_classes = parent_label_class|split(' ')|filter(class => class in ['checkbox-inline', 'radio-inline']) %}
95+
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ embed_label_classes|join(' '))|trim}) -%}
96+
{% endif %}
9397
{%- if label is not same as(false) and label is empty -%}
9498
{%- if label_format is not empty -%}
9599
{%- set label = label_format|replace({

Resources/views/Form/foundation_5_layout.html.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@
253253
{% if errors|length > 0 -%}
254254
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' error')|trim}) %}
255255
{% endif %}
256+
{%- if parent_label_class is defined -%}
257+
{% set embed_label_classes = parent_label_class|split(' ')|filter(class => class in ['checkbox-inline', 'radio-inline']) %}
258+
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ embed_label_classes|join(' '))|trim}) -%}
259+
{% endif %}
256260
{% if label is empty %}
257261
{%- if label_format is not empty -%}
258262
{% set label = label_format|replace({

0 commit comments

Comments
 (0)