From b6af3f6f343ecafb25bddf66a262fc278b84ecbb Mon Sep 17 00:00:00 2001 From: D Ruth Bavousett Date: Mon, 13 Feb 2012 10:25:40 -0500 Subject: [PATCH] Bug 7535: ampersands not showing properly in non-XSLT OPAC Jared's fix for Bug 3326 fixed this in the staff client, but not the OPAC; moving this one line fixes it both places. Signed-off-by: Liz Rea This can be replicated by indexing with -x OPACXSLTResults must be set to "normally" Reproduced original bug with rebuild-zebra.pl -x -b -w -r -v -v Patch corrects the issue, does not change intranet behavior. Signed-off-by: Paul Poulain (cherry picked from commit bbfaf8264c815013cd37155c9aac283e3cb3cc4a) Signed-off-by: Chris Nighswonger --- C4/Output.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C4/Output.pm b/C4/Output.pm index 75ced46551..9087075ee5 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -297,12 +297,12 @@ sub output_with_http_headers($$$$;$) { # utf8::encode($data) if utf8::is_utf8($data); + $data =~ s/\&\;amp\; /\&\; /g; print $query->header($options), $data; } sub output_html_with_http_headers ($$$;$) { my ( $query, $cookie, $data, $status ) = @_; - $data =~ s/\&\;amp\; /\&\; /g; output_with_http_headers( $query, $cookie, $data, 'html', $status ); } -- 2.39.5