Skip to content

Commit bfbade6

Browse files
Merge branch '5.4' into 6.4
* 5.4: [Validator] Fix 58691 (missing plural-options in serbian language translation) profiler form data collector extart value property if it is setted [Process] Fix escaping /X arguments on Windows [Config] Handle Phar absolute path in `FileLocator`
2 parents fcf20a1 + 8ce2ad9 commit bfbade6

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Resources/views/Collector/form.html.twig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,10 @@
646646
<td>{{ profiler_dump(value) }}</td>
647647
<td>
648648
{# values can be stubs #}
649-
{% set option_value = value.value|default(value) %}
650-
{% set resolved_option_value = data.resolved_options[option].value|default(data.resolved_options[option]) %}
649+
{% set option_value = (value.value is defined) ? value.value : value %}
650+
{% set resolved_option_value = (data.resolved_options[option].value is defined)
651+
? data.resolved_options[option].value
652+
: data.resolved_options[option] %}
651653
{% if resolved_option_value == option_value %}
652654
<em class="font-normal text-muted">same as passed value</em>
653655
{% else %}

0 commit comments

Comments
 (0)