Merge branch 'bug2505_patches' of git://git.catalyst.net.nz/koha into to-push

[koha_gimpoz] / C4 / Output.pm

diff --git a/C4/Output.pm b/C4/Output.pm
index 61e79c6..b512f30 100644 (file)
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -461,6 +461,7 @@ sub output_with_http_headers($$$$;$) {
 
 sub output_html_with_http_headers ($$$;$) {
     my ( $query, $cookie, $data, $status ) = @_;
+    $data =~ s/\&amp\;amp\; /\&amp\; /;
     output_with_http_headers( $query, $cookie, $data, 'html', $status );
 }