X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FOutput.pm;h=9087075ee5153866725466d6583ec73fc8a5f51c;hb=db946ffd58094ec6287f991493a8df7bd7298f71;hp=6ab16d9785a0af6731a7013f96425dd0bdd0775c;hpb=7267ea91acb5902c6539a01fc0c13ea30640aa94;p=koha_gimpoz diff --git a/C4/Output.pm b/C4/Output.pm index 6ab16d9785..9087075ee5 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -291,21 +291,18 @@ sub output_with_http_headers($$$$;$) { $options->{'Content-Style-Type' } = 'text/css'; $options->{'Content-Script-Type'} = 'text/javascript'; } - # remove SUDOC specific NSB NSE - $data =~ s/\x{C2}\x{98}|\x{C2}\x{9C}/ /g; - $data =~ s/\x{C2}\x{88}|\x{C2}\x{89}/ /g; - + # We can't encode here, that will double encode our templates, and xslt # We need to fix the encoding as it comes out of the database, or when we pass the variables to templates # 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 ); }