Skip to content

Commit ea185c5

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: [HttpFoundation] Support 0 bit netmask in IPv6 () [DI] Impossible to set an environment variable and then an array as container parameter [LDAP] added missing dots at the end of some exception messages. Set `width: auto` on WebProfiler toolbar's reset. [Process] Dont rely on putenv(), it fails on ZTS PHP [HttpKernel] detect deprecations thrown by container initialization during tests [HttpKernel] Fix logging of post-terminate errors/exceptions [Debug] Fix catching fatal errors in case of nested error handlers [VarDumper] Fixed file links leave blank pages when ide is configured Fix hidden currency element with Bootstrap 3 theme
2 parents de6cb3a + b769ee4 commit ea185c5

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

Resources/views/Form/bootstrap_base_layout.html.twig

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,21 @@
88
{%- endblock textarea_widget %}
99

1010
{% block money_widget -%}
11-
<div class="input-group{{ group_class|default('') }}">
12-
{%- set append = money_pattern starts with '{{' -%}
13-
{%- if not append -%}
14-
<span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
15-
{%- endif -%}
11+
{% set prepend = not (money_pattern starts with '{{') %}
12+
{% set append = not (money_pattern ends with '}}') %}
13+
{% if prepend or append %}
14+
<div class="input-group{{ group_class|default('') }}">
15+
{% if prepend %}
16+
<span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
17+
{% endif %}
18+
{{- block('form_widget_simple') -}}
19+
{% if append %}
20+
<span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
21+
{% endif %}
22+
</div>
23+
{% else %}
1624
{{- block('form_widget_simple') -}}
17-
{%- if append -%}
18-
<span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
19-
{%- endif -%}
20-
</div>
25+
{% endif %}
2126
{%- endblock money_widget %}
2227

2328
{% block percent_widget -%}

0 commit comments

Comments
 (0)