diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
index 39266eab03..9d70124fbe 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
@@ -16,7 +16,7 @@
-
+ null
null
true
null
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 4ab569020f..4ae5063064 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -88,10 +88,13 @@
{% if collector.logs %}
- {% for log in collector.logs if priority >= 0 and log.priority >= priority or priority < 0 and log.context.type|default(0) == priority %}
- -
- {{ logger.display_message(loop.index, log) }}
-
+ {% for log in collector.logs %}
+ {% set is_deprecation = log.context.level is defined and log.context.type is defined and (constant('E_DEPRECATED') == log.context.type or constant('E_USER_DEPRECATED') == log.context.type) %}
+ {% if priority == '-100' ? is_deprecation : log.priority >= priority %}
+ -
+ {{ logger.display_message(loop.index, log, is_deprecation) }}
+
+ {% endif %}
{% else %}
- No logs available for this priority.
{% endfor %}
@@ -104,15 +107,18 @@
{% endblock %}
-{% macro display_message(log_index, log) %}
- {% if log.context.level is defined and log.context.type is defined and (constant('E_DEPRECATED') == log.context.type or constant('E_USER_DEPRECATED') == log.context.type) %}
- DEPRECATION - {{ log.message }}
- {% set id = 'sf-call-stack-' ~ log_index %}
-
-
-
-
- {% for index, call in log.context.stack if index > 1 %}
+{% macro display_message(log_index, log, is_deprecation) %}
+ {% if is_deprecation %}
+ {% set stack = log.context.stack|default([]) %}
+
+ {% if stack %}
+
+
+
+
+ {% endif %}
+
+ {% for index, call in stack if index > 1 %}
{% if index == 2 %}
{% endif %}
@@ -128,7 +134,7 @@
- Called from {{ call.file is defined and call.line is defined ? call.file|format_file(call.line, from) : from|raw }}
- {% if index == log.context.stack|length - 1 %}
+ {% if index == stack|length - 1 %}
{% endif %}
{% endfor %}