X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f9f38ae31c239ce2f44ea0ed2984295aac09ead3..4745391360cf0843e376676479fee306d0a8312d:/IkiWiki/CGI.pm?ds=inline

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 155010a97..567fa85be 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -33,10 +33,9 @@ sub showform ($$$$) { #{{{
 				buttons => $buttons);
 		});
 	}
-	else {
-		printheader($session);
-		print misctemplate($form->title, $form->render(submit => $buttons));
-	}
+
+	printheader($session);
+	print misctemplate($form->title, $form->render(submit => $buttons));
 }
 
 sub redirect ($$) { #{{{
@@ -249,7 +248,7 @@ sub cgi_prefs ($$) { #{{{
 	$form->field(name => "email", size => 50, fieldset => "preferences");
 	$form->field(name => "subscriptions", size => 50,
 		fieldset => "preferences",
-		comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
+		comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
 	$form->field(name => "banned_users", size => 50,
 		fieldset => "admin");
 	
@@ -386,7 +385,9 @@ sub cgi_editpage ($$) { #{{{
 	$form->tmpl_param("can_commit", $config{rcs});
 	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
-		htmllink("", "", "HelpOnFormatting", noimageinline => 1));
+		htmllink("", "", "ikiwiki/formatting",
+			noimageinline => 1,
+			linktext => "FormattingHelp"));
 	$form->tmpl_param("baseurl", baseurl());
 	
 	if ($form->submitted eq "Cancel") {
@@ -596,6 +597,10 @@ sub cgi_editpage ($$) { #{{{
 		# may have been committed while the post-commit hook was
 		# disabled.
 		require IkiWiki::Render;
+		# Reload index, since the first time it's loaded is before
+		# the wiki is locked, and things may have changed in the
+		# meantime.
+		loadindex();
 		refresh();
 		saveindex();