Bug 3326: Staff results still displayed &
authorJared Camins-Esakov <jcamins@bywatersolutions.com>
Sat, 26 Mar 2011 09:58:54 +0000 (05:58 -0400)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Tue, 5 Apr 2011 00:00:27 +0000 (20:00 -0400)
In certain circumstances, ampersands would not be displayed properly in the
Staff client search results. This patch fixes that by ensuring that all the
doubled ampersands that Zebra inserts in XML indexing mode are replaced by the
correct single ampersand entity.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
C4/Output.pm

index 9f5ed5e..a6cb984 100644 (file)
@@ -474,7 +474,7 @@ sub output_with_http_headers($$$$;$) {
 
 sub output_html_with_http_headers ($$$;$) {
     my ( $query, $cookie, $data, $status ) = @_;
-    $data =~ s/\&amp\;amp\; /\&amp\; /;
+    $data =~ s/\&amp\;amp\; /\&amp\; /g;
     output_with_http_headers( $query, $cookie, $data, 'html', $status );
 }