diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch stof/timeline_panel (PR #5801)

Browse Source 
This PR was merged into the 2.1 branch.

Commits
-------

039bdfd [WebProfilerBundle] Fixed the use of nested macros

Discussion
----------

[WebProfilerBundle] Fixed the use of nested macros

Closes #5800

---------------------------------------------------------------------------

by stof at 2012-10-22T20:03:10Z

@fabpot ping. this regression is quite annoying as I like the profiler
This commit is contained in:
Fabien Potencier 2012-10-22 22:20:01 +02:00
commit 28482f8216
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
View File

@ -1,6 +1,6 @@
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
{% from _self import display_timeline, dump_events, dump_request_data %}
{% from _self import display_timeline, dump_request_data %}
{% if colors is not defined %}
{% set colors = {
@ -429,6 +429,7 @@
{% endblock %}
{% macro dump_request_data(token, profile, events, origin) %}
{% from _self import dump_events %}
{
"id": "{{ token }}",
"left": {{ "%F"|format(events.__section__.origin - origin) }},