8000 Merge branch '2.8' into 3.0 · ostrolucky/symfony@e78090c · GitHub
[go: up one dir, main page]
Skip to content

Commit e78090c

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.0
* 2.8: fix debug toolbar rendering by removing inadvertently added links [Form] minor fix tests of Bootstrap layout [From] minor fix tests added by symfony#17798 for bootstrap theme simplified code Allow variadic controller parameters to be resolved.
2 parents f771c36 + 76cfccd commit e78090c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎Resources/views/Profiler/toolbar_item.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="sf-toolbar-block sf-toolbar-block-{{ name }} sf-toolbar-status-{{ status|default('normal') }} {{ additional_classes|default('') }}">
2-
{% if link|default(true) %}<a href="{{ path('_profiler', { token: token, panel: name }) }}">{% endif %}
2+
{% if link is not defined or link %}<a href="{{ path('_profiler', { token: token, panel: name }) }}">{% endif %}
33
<div class="sf-toolbar-icon">{{ icon|default('') }}</div>
4-
{% if link|default(true) %}</a>{% endif %}
4+
{% if link is not defined or link %}</a>{% endif %}
55
<div class="sf-toolbar-info">{{ text|default('') }}</div>
66
</div>

0 commit comments

Comments
 (0)
0