From dc61b3568f8eea9234413bcd83728bfc9ed91433 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 28 Sep 2022 14:11:45 +0000 Subject: [PATCH] Bug 16522: (follow-up) Remove HTML links from email The emails sent for cart and list are plain text and any tag will be scrubbed by HtmlToText. So we can remove those links. This also solves an issue with the original patch set, where the error below would appear on sending a cart or list email from the staff interface: Template process failed: file error - biblio_a_href: not found at /kohadevbox/koha/C4/Templates.pm line 127 Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt index 51bc97ff765..097090a5d2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -131,9 +131,9 @@ Your cart [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] In: [% IF BIBLIO_RESULT.HOSTITEMENTRIES.biblionumber %] - [% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] [% ELSE %] - [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] + [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt index 85dffc54f11..4c51b47eedc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt @@ -138,9 +138,9 @@ Your list: [% shelfname | $raw %] [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] In: [% IF BIBLIO_RESULT.HOSTITEMENTRIES.biblionumber %] - [% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] [% ELSE %] - [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] + [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt index 03b1de38373..f676084f906 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt @@ -136,9 +136,9 @@ Your cart [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] In: [% IF BIBLIO_RESULT.HOSTITEMENTRIES.biblionumber %] -
[% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] [% ELSE %] - [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] + [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt index 66469110153..f81308d0fdd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt @@ -139,9 +139,9 @@ Your list : [% shelfname | $raw %] [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] In: [% IF BIBLIO_RESULT.HOSTITEMENTRIES.biblionumber %] - [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | $raw %] [% ELSE %] - [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] + [% BIBLIO_RESULT.HOSTITEMENTRIES | html %] [% END %]
-- 2.20.1