From feae031a80805550b38cb4fd9694d01ce7ef0627 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 16:31:18 -0400 Subject: highlight: Fix utf-8 encoding bug. Closes: #535028 --- IkiWiki/Plugin/highlight.pm | 3 ++- debian/changelog | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 20f79ef57..9bdde85ae 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::highlight; use warnings; use strict; use IkiWiki 3.00; +use Encode; # locations of highlight's files my $filetypes="/etc/highlight/filetypes.conf"; @@ -69,7 +70,7 @@ sub htmlizefallback { return; } - return highlight($langfile, shift); + return Encode::decode_utf8(highlight($langfile, shift)); } my %ext2lang; diff --git a/debian/changelog b/debian/changelog index bb33f25f3..239b22b42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -ikiwiki (3.1415) UNRELEASED; urgency=low +ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) * Updated French debconf templates translation. Closes: #535103 * openid: Support Net::OpenID 2.x when pretty-printing openids. (smcv) + * highlight: Fix utf-8 encoding bug. Closes: #535028 - -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 + -- Joey Hess Tue, 07 Jul 2009 16:25:05 -0400 ikiwiki (3.141) unstable; urgency=low -- cgit v1.2.3