bug #17976 [2.3][WebProfilerBundle] fix debug toolbar rendering by removing inadvertently added links (craue)

fabpot · fabpot · commit 17e8780750bc · 2016-03-01T18:34:19.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [2.3][WebProfilerBundle] fix debug toolbar rendering by removing inadvertently added links | Q | A | ------------- | --- | Branch | 2.3+ | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The debug toolbar was broken by #17527... **before** ![debug-toolbar-link-a](https://cloud.githubusercontent.com/assets/800119/13433728/7c48c382-dfd3-11e5-8432-299bfa143647.png) **and after** ![debug-toolbar-link-b](https://cloud.githubusercontent.com/assets/800119/13433732/7fd97dc0-dfd3-11e5-80c6-62c009447a2e.png) **explanation** If `false` is explicitly passed for `link` then `link | default(true)` would evaluate to `true`, which is not what we want. The correct expression `link is not defined or link` was suggested originally in #16653. Commits ------- a0ddfc4 fix debug toolbar rendering by removing inadvertently added links
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
@@ -1,4 +1,4 @@
-{% if link|default(true) %}
+{% if link is not defined or link %}
     {% set icon %}
         <a href="{{ path('_profiler', { 'token': token, 'panel': name }) }}">{{ icon }}</a>
     {% endset %}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% if link\|default(true) %}`
	`1`	`+{% if link is not defined or link %}`
`2`	`2`	`{% set icon %}`
`3`	`3`	`<a href="{{ path('_profiler', { 'token': token, 'panel': name }) }}">{{ icon }}</a>`
`4`	`4`	`{% endset %}`