* Put back the encode_utf8 in the input to markdown; it's really not utf-8

  safe.

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 87546eeb3c785259df656ef67f24030fd0e2e15a..d4e498188aad43c37f05fd28a094a951758b0a14 100644 (file)
--- 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";
                $blosxom::version="is a proper perl module too much to ask?";
                use warnings 'all';
                do "/usr/bin/markdown";

+               use Encode;

        }
        
        if ($type eq '.mdwn') {
        }
        
        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");
        }
        else {
                error("htmlization of $type not supported");

diff --git a/debian/changelog b/debian/changelog
index e5778c0bb7463f75b89cc97d2fc152b3261b1dd2..5ee82efd825412682bc9bcde80e80c261d26cb35 100644 (file)
--- 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.
   * 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
 
 
 ikiwiki (1.5) unstable; urgency=low