From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 17 Oct 2018 14:29:16 +0000 (-0300)
Subject: Bug 21576: Preserve chomp chars for USE raw
X-Git-Tag: v18.11.00~390
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=ddef9376f2e26375d51c58aa83689780b94c61df;hp=1dbea5dd2c5c98b53dbc88493b97d6e0c419c244;p=koha_ffzg

Bug 21576: Preserve chomp chars for USE raw

See bug 21526 comments 5-7

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---

diff --git a/t/lib/QA/TemplateFilters.pm b/t/lib/QA/TemplateFilters.pm
index 0a3fa44685..f2009cc929 100644
--- a/t/lib/QA/TemplateFilters.pm
+++ b/t/lib/QA/TemplateFilters.pm
@@ -67,7 +67,7 @@ sub _process_tt_content {
             }
 
             $has_use_raw++
-              if $line =~ m{\[% USE raw %\]};    # Does [% Use raw %] exist?
+              if $line =~ m{\[%(\s|-|~)*USE raw(\s|-|~)*%\]};    # Does [% Use raw %] exist?
 
             my $e;
             if ( $line =~ qr{<a href="([^"]+)} ) {
diff --git a/t/template_filters.t b/t/template_filters.t
index c4bb841448..33e1af9510 100644
--- a/t/template_filters.t
+++ b/t/template_filters.t
@@ -171,7 +171,7 @@ EXPECTED
 subtest 'Preserve pre/post chomps' => sub {
     plan tests => 1;
     my $input = <<INPUT;
-[% USE raw %]
+[%- USE raw -%]
 [%- var -%]
 [% - var - %]
 [%~ var ~%]
@@ -182,7 +182,7 @@ subtest 'Preserve pre/post chomps' => sub {
 [%~ var | uri ~%]
 INPUT
     my $expected = <<EXPECTED;
-[% USE raw %]
+[%- USE raw -%]
 [%- var | html -%]
 [%- var | html -%]
 [%~ var | html ~%]