From bd6e5a4c32496c94b0f90010fdc6b8dc047ea64f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Thu, 24 Mar 2016 11:59:27 +0100
Subject: [PATCH] Bug 14614: Multiple URLs (856) in cart/list email are broken
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

To reproduce:
- Add multiple subfields 856 u to a bilbio
- Add this biblio to a cart and send it as mail
  (from Staff client and from OPAC)
Result: Links in mail body are broken

To test
- Apply patch
- Send carts again (from Staff client and from OPAC)
- Result: In mail body, links display separated with blank-pipe-blank
  like http://bla.com | http://blabla.com | http://blablabla.com
- Change one of the 856 u to not to be a link, e.g. äöü
- Send carts again
- Verify that in mail body äöü correctly display as text.

(Amended to make it work for OPAC as well, MV)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit d135499d2893fe1000c627f433395989d7d9e022)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt  | 2 +-
 2 files changed, 2 insertions(+), 2 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 c99b54ebfa..adb47cd0d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
@@ -125,7 +125,7 @@ Your cart
             [% END %]
             [% IF ( BIBLIO_RESULT.url ) %]
             <span>
-                URL: [% BIBLIO_RESULT.url |url %]
+                URL: [% BIBLIO_RESULT.url %]
             </span>
             [% END %]
             </p>
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 e3c88abdd7..7c7978f496 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
@@ -125,7 +125,7 @@ Your cart
             [% END %]
             [% IF ( BIBLIO_RESULT.url ) %]
             <span>
-                URL: [% BIBLIO_RESULT.url |url %]
+                URL: [% BIBLIO_RESULT.url %]
             </span>
             [% END %]
             </p>
-- 
2.39.5