From cd0b96941f6a6552793f6acdc7c4f91dd93995ff Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Tue, 4 Dec 2018 18:58:17 +0000 Subject: [PATCH] Bug 21947: Swap the filter order TEST PLAN ---------- 1) start your kohadevbox 2) cd kohaclone 3) git checkout -b bug_21947 origin/master 4) git bz apply 21947 5) reset_all 6) log in to staff client and add a 500$a with lots of blank lines between strings with some HTML. 7) look at the opac record Title notes tab. -- does it have
-mess? Should not. 8) repeat steps 5-7 on master, and you'll see a
-mess. 9) run qa test tools Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit d90d5d2254d55752bf1e524885284ba8e3e86f60) Signed-off-by: Martin Renvoize --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index afb8f9aa58..331d3076d6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -714,7 +714,7 @@ [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] [% MARCNOTE.marcnote | html %] [% ELSE %] - [% MARCNOTE.marcnote FILTER html_line_break | html %] + [% MARCNOTE.marcnote | html | html_line_break %] [% END %]

[% END %] -- 2.39.5