X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa9517e5bb07fad29fddb219e6c8e8f1b0a08d7e..77b38730d4d0ceaa8093c8f459d95f4c75a921a9:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b2d126977..3e4cbe4cf 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,7 +4,8 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
-use encoding 'utf8'; # force use of utf8 for io layer
+use open qw{:utf8 :std};
+use Encode;
 
 package IkiWiki;
 
@@ -316,10 +317,13 @@ sub cgi_editpage ($$) { #{{{
 	}
 	$page=lc($page);
 	
-	my $file=$page.$config{default_pageext};
+	my $file;
 	if (exists $pagesources{lc($page)}) {
 		$file=$pagesources{lc($page)};
 	}
+	else {
+		$file=$page.".".$config{default_pageext};
+	}
 	my $newfile=0;
 	if (! -e "$config{srcdir}/$file") {
 		$newfile=1;
@@ -352,7 +356,6 @@ sub cgi_editpage ($$) { #{{{
 		require IkiWiki::Render;
 		# Apparently FormBuilder doesn't not treat input as
 		# utf-8, so decode from it.
-		require Encode;
 		my $content = Encode::decode_utf8($form->field('editcontent'));
 		my $comments = Encode::decode_utf8($form->field('comments'));
 		$form->field(name => "editcontent",
@@ -360,7 +363,7 @@ sub cgi_editpage ($$) { #{{{
 		$form->field(name => "comments",
 				value => $comments, force => 1);
 		$form->tmpl_param("page_preview",
-			htmlize($config{default_pageext},
+			htmlize(pagetype($file),
 				linkify($page, $page, $content)));
 	}
 	else {
@@ -442,7 +445,6 @@ sub cgi_editpage ($$) { #{{{
 		page_locked($page, $session);
 		
 		# Decode utf-8 since FormBuilder does not
-		require Encode;
 		my $content=Encode::decode_utf8($form->field('editcontent'));
 
 		$content=~s/\r\n/\n/g;