diff options
| -rw-r--r-- | IkiWiki/Render.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 87546eeb3..d4e498188 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -29,10 +29,11 @@ sub htmlize ($$) { #{{{ $blosxom::version="is a proper perl module too much to ask?"; use warnings 'all'; do "/usr/bin/markdown"; + use Encode; } if ($type eq '.mdwn') { - $content=Markdown::Markdown($content); + $content=Encode::decode_utf8(Markdown::Markdown(Encode::encode_utf8($content))); } else { error("htmlization of $type not supported"); diff --git a/debian/changelog b/debian/changelog index e5778c0bb..5ee82efd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,10 @@ ikiwiki (1.6) UNRELEASED; urgency=low * Revert some of the decode_utf8 changes in CGI.pm that seem unnecessary given the readfile fix. * Add utf-8 testcases for readfile and htmlize. + * Put back the encode_utf8 in the input to markdown; it's really not utf-8 + safe. - -- Joey Hess <joeyh@debian.org> Thu, 15 Jun 2006 01:46:03 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 16 Jun 2006 00:41:25 -0400 ikiwiki (1.5) unstable; urgency=low |