Merge branch '2.3' into 2.7

fabpot · fabpot · commit 82e58acf84ef · 2016-03-01T18:34:38.000+01:00
* 2.3:
  fix debug toolbar rendering by removing inadvertently added links
  simplified code
  Allow variadic controller parameters to be resolved.
diff --git a/Resources/views/Profiler/toolbar_item.html.twig b/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 %}`