From 25b2445176529bd87e199dcc72f967702156805c Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Tue, 16 Sep 2008 21:58:13 -0500
Subject: [PATCH] bug 2596: remove URL escaping added by previous patch

If URL in an href comes from a MARC record, it should not
be URL-escaped - otherwise, link is interpreted as relative
to MARCdetail.pl.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 .../prog/en/modules/catalogue/MARCdetail.tmpl | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index da57805d7c..13249edf0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -90,7 +90,6 @@ function Changefwk(FwkList) {
                     <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -120,11 +119,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -154,11 +157,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -188,11 +195,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -222,11 +233,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"> alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -256,11 +271,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -290,11 +309,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -324,11 +347,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -358,11 +385,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -392,11 +423,15 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
 <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 =======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
 >>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+=======
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
+>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
-- 
2.20.1