From 7ef68ea59d1f30529645bb24fbd73082354dd833 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= Date: Tue, 25 Aug 2015 07:24:54 +0000 Subject: [PATCH] Bug 14703: Holidays description shows \r\n for every new line Adds a new line for the holiday's description instead of the string \r\n. Test plan: 1. In tools -> Calendar look at some holiday's description (Do a new holiday with description of multiple lines if there is not already) 2. Notice that there is characters \r\n if someone has put a newline in the holiday's description 3. Apply patch 4. See that the new lines show there now nicely Sponsored-by: Vaara-kirjastot Signed-off-by: Marcel de Rooy Amended slightly: no need to replace title. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt index f29944d353..8e307ba9ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -517,7 +517,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl [% HOLIDAYS_LOO.DATE %] [% HOLIDAYS_LOO.TITLE %] - [% HOLIDAYS_LOO.DESCRIPTION %] + [% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '
') %] [% END %] -- 2.39.5