FUCK UTF8 fuck fuck fuck!!!

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 87546eeb3c785259df656ef67f24030fd0e2e15a..22fba3a2fd1fe935e20b0fc2d5fc724d0219a790 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";
+               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");
@@ -229,7 +230,7 @@ sub check_overwrite ($$) { #{{{
 sub displaytime ($) { #{{{
        my $time=shift;
 
-       if ($config{timeformat} eq '%c') {
+       if ($config{timeformat} eq '%c' && ! exists $ENV{LC_CTIME}) {
                return scalar(localtime($time)); # optimisation
        }
        else {