From 25b2445176529bd87e199dcc72f967702156805c Mon Sep 17 00:00:00 2001 From: Galen Charlton 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 Signed-off-by: Chris Cormack --- .../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) { "> "> - "> ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -120,11 +119,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -154,11 +157,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -188,11 +195,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -222,11 +233,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on "> alt="Search on " /> @@ -256,11 +271,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -290,11 +309,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -324,11 +347,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -358,11 +385,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -392,11 +423,15 @@ function Changefwk(FwkList) {   "> +<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl <<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl "> ======= "> >>>>>>> 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 +======= + "> +>>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl ,phr&type=intranet&q="> //images/filefind.png" height="15" title="Search on " alt="Search on " /> -- 2.39.5