X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2ce6d15b8bdc23f1b7cb3e71168ff5df580eb267..a5fdf4714732c754c6bee16ff65fa85968737010:/IkiWiki/Render.pm?ds=sidebyside

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 87546eeb3..22fba3a2f 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");
@@ -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 {