X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/65be0598a96a6a24a1a6993df524fda256b9bc97..2d357696064233444a5777f787a3741dd85faae6:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 1471ae926..9fc65e34a 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -316,8 +316,10 @@ sub cgi_editpage ($$) { #{{{
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
+		header => 0,
 		table => 0,
 		template => scalar template_params("editpage.tmpl"),
+		wikiname => $config{wikiname},
 	);
 	
 	run_hooks(formbuilder_setup => sub {
@@ -400,7 +402,7 @@ sub cgi_editpage ($$) { #{{{
 			htmlize($page, $type,
 			linkify($page, "",
 			preprocess($page, $page,
-			filter($page, $form->field('editcontent')), 0, 1))));
+			filter($page, $page, $form->field('editcontent')), 0, 1))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -471,6 +473,7 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "type", type => 'select',
 				options => \@page_types);
 			$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
+			
 		}
 		elsif ($form->field("do") eq "edit") {
 			check_canedit($page, $q, $session);
@@ -490,7 +493,8 @@ sub cgi_editpage ($$) { #{{{
 			$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
 		}
 		
-		print $form->render(submit => \@buttons);
+		printheader($session);
+		print misctemplate($form->title, $form->render(submit => \@buttons));
 	}
 	else {
 		# save page
@@ -503,7 +507,8 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		elsif (-e "$config{srcdir}/$file" &&
@@ -518,7 +523,8 @@ sub cgi_editpage ($$) { #{{{
 				value => readfile("$config{srcdir}/$file").
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		
@@ -540,7 +546,8 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		
@@ -584,7 +591,8 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		else {