X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8a8e54f3f61721b40c60712c4c5c0cefd049502e..ec72b4c95bce640f8b02b7885dad84640b924ffe:/IkiWiki/Plugin/editpage.pm

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index d15607990..78d0704c7 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -342,7 +342,7 @@ sub cgi_editpage ($$) {
 	else {
 		# save page
 		check_canedit($page, $q, $session);
-		checksessionexpiry($q, $session, $q->param('sid'));
+		checksessionexpiry($q, $session);
 
 		my $exists=-e "$config{srcdir}/$file";
 
@@ -400,10 +400,12 @@ sub cgi_editpage ($$) {
 		eval { writefile($file, $config{srcdir}, $content) };
 		$config{cgi}=1;
 		if ($@) {
+			# save $@ in case a called function clobbers it
+			my $error = $@;
 			$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 				force => 1);
 			my $mtemplate=template("editfailedsave.tmpl");
-			$mtemplate->param(error_message => $@);
+			$mtemplate->param(error_message => $error);
 			$form->tmpl_param("message", $mtemplate->output);
 			$form->field("editcontent", value => $content, force => 1);
 			$form->tmpl_param("page_select", 0);