[Koha-bugs] [Bug 14716] Correctly URI-encode URLs in XSLT result lists and detail pages

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14716

Jonathan Druart <jonathan.druart at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #59 from Jonathan Druart <jonathan.druart at bugs.koha-community.org> ---
First patch does not longer apply

Applying: Bug 14716: URI-encode URLs in MARC21 xsl templates.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
M       koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
M       koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl

-- 
You are receiving this mail because:
You are watching all bug changes.