From 605b99470c9a29cf6f4c2d37513d29d5c4303d48 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 4 Jun 2015 12:03:42 +0200 Subject: [PATCH] Bug 14329: Useless copy/pasta from Template::Plugin::HtmlToText The synopsis of this TT plugin contains two example lines: [% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %] [% myhtmltext | html2text %] These lines have been copied (without too much thought :) to a few templates. Since we do no use the variables myhtml or myhtmltext in these templates, these lines are useless. Test plan: [1] Put some items in your cart. And send it. [2] Send a shelf. [3] Git grep on myhtml. Should not have results. NOTE: Sent carts and lists in Intranet and OPAC successfully. Though, this does bring into question why the letters have HTML formatting if it is getting removed. That, however, is beyond the scope of this bug. Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 4fd923e12eea70b7e871f0068471ff5ef91dda01) Signed-off-by: Chris Cormack --- koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt | 2 -- .../intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt | 2 -- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt | 2 -- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt | 2 -- 4 files changed, 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 0514bc1dc3..c99b54ebfa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -3,8 +3,6 @@ Your cart [% USE HtmlToText %] -[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %] -[% myhtmltext | html2text %]
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 f3738f4868..b70dac9595 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt @@ -3,8 +3,6 @@ Your list: [% shelfname %] [% USE HtmlToText %] -[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %] -[% myhtmltext | html2text %]
[% FILTER html2text %] 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 29c4cbb4fe..e3c88abdd7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt @@ -3,8 +3,6 @@ Your cart [% USE HtmlToText %] -[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %] -[% myhtmltext | html2text %]
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 91041bb801..4c7f5d43c4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt @@ -3,8 +3,6 @@ Your list : [% shelfname %] [% USE HtmlToText %] -[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %] -[% myhtmltext | html2text %]
[% FILTER html2text %] -- 2.39.5