X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d534483b9befc360b3d973091b1b7f5692f15a6e..a5fdf4714732c754c6bee16ff65fa85968737010:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0dfa03cd4..22fba3a2f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -29,12 +29,10 @@ sub htmlize ($$) { #{{{
 		$blosxom::version="is a proper perl module too much to ask?";
 		use warnings 'all';
 		do "/usr/bin/markdown";
-		require Encode;
+		use Encode;
 	}
 	
 	if ($type eq '.mdwn') {
-		# Markdown does character based stuff that does not work
-		# well with utf-8 strings.
 		$content=Encode::decode_utf8(Markdown::Markdown(Encode::encode_utf8($content)));
 	}
 	else {
@@ -232,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 {