commit d8a49435b5f6c767cb6efce3940325eb3e1c6f1b Author: Joel Pittet Date: Fri Sep 25 12:17:05 2015 +0200 fixes diff --git a/core/modules/views/src/Plugin/views/field/Boolean.php b/core/modules/views/src/Plugin/views/field/Boolean.php index 37001ec..3a0740d 100644 --- a/core/modules/views/src/Plugin/views/field/Boolean.php +++ b/core/modules/views/src/Plugin/views/field/Boolean.php @@ -119,8 +119,8 @@ public function render(ResultRow $values) { } if ($this->options['type'] == 'custom') { - $custom_value = $value ? UtilityXss::filterAdmin($this->options['type_custom_true']) : UtilityXss::filterAdmin($this->options['type_custom_false']); - return ViewsRenderPipelineSafeString::create($custom_value); + $custom_value = $value ? $this->options['type_custom_true'] : $this->options['type_custom_false']; + return ViewsRenderPipelineSafeString::create(UtilityXss::filterAdmin($custom_value)); } elseif (isset($this->formats[$this->options['type']])) { return $value ? $this->formats[$this->options['type']][0] : $this->formats[$this->options['type']][1]; diff --git a/core/modules/views/tests/themes/views_test_theme/templates/views-view-field.html.twig b/core/modules/views/tests/themes/views_test_theme/templates/views-view-field.html.twig index 682d4db..3360128 100644 --- a/core/modules/views/tests/themes/views_test_theme/templates/views-view-field.html.twig +++ b/core/modules/views/tests/themes/views_test_theme/templates/views-view-field.html.twig @@ -4,7 +4,7 @@ * Theme override to display all the fields in a views row. * * The reason for this template is to override the theme function provided by - * views. + * views to allow tests to run against the twig template. */ #} {% include '@views/views-view-field.html.twig' %}