Skip to content

Commit 32c9657

Browse files
Merge branch '3.1'
* 3.1: [travis] Don't use parallel on HHVM [HttpKernel] Fix RequestDataCollector starting the session [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows [FrameworkBundle] Skip redis cache pools test on failed connection Fixed forwarded request data in templates [Security] Fix DebugAccessDecisionManager when object is not a scalar Skip some tests on HHVM due to a PHPunit bug Use the Trusty Travis infrastructure for HHVM builds LdapUserProvider: add missing argument type doc Fixed issue with missing argument in the abstract service definition for the ldap user provider Add 3.1 to PR template branch row, remove 2.3 Improve memory efficiency [Console] Fix BC break introduced by #18101 document method name changes in Voter class add missing hint for vote() argument type [#18838] add a test to avoid regressions bumped Symfony version to 3.1.1 updated VERSION for 3.1.0 updated CHANGELOG for 3.1.0 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents e3855c5 + 7821004 commit 32c9657

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Resources/views/Collector/request.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{% endset %}
1414
{% endif %}
1515

16-
{% if collector.forward %}
16+
{% if collector.forward|default(false) %}
1717
{% set forward_handler %}
1818
{% import _self as helper %}
1919
{{ helper.set_handler(collector.forward.controller) }}
@@ -26,7 +26,7 @@
2626
<span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}">{{ collector.statuscode }}</span>
2727
{% if collector.route %}
2828
{% if collector.redirect %}{{ include('@WebProfiler/Icon/redirect.svg') }}{% endif %}
29-
{% if collector.forward %}{{ include('@WebProfiler/Icon/forward.svg') }}{% endif %}
29+
{% if collector.forward|default(false) %}{{ include('@WebProfiler/Icon/forward.svg') }}{% endif %}
3030
<span class="sf-toolbar-label">{{ 'GET' != collector.method ? collector.method }} @</span>
3131
<span class="sf-toolbar-value sf-toolbar-info-piece-additional">{{ collector.route }}</span>
3232
{% endif %}

Resources/views/Profiler/layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dl>
4545
{%- endif %}
4646

47-
{% if request_collector and request_collector.forward and request_collector.forward.controller.class is defined -%}
47+
{% if request_collector and request_collector.forward|default(false) and request_collector.forward.controller.class is defined -%}
4848
{%- set forward = request_collector.forward -%}
4949
{%- set controller = forward.controller -%}
5050
<dl class="metadata">

0 commit comments

Comments
 (0)