From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 1 Jul 2008 20:13:47 +0000 (-0400)
Subject: save attachments when page is saved too
X-Git-Tag: 2.52~14^2~15
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/14cb2b0869496105915892b509016b9e46991ee7?ds=sidebyside;hp=--cc

save attachments when page is saved too

A user might specify an attachment, but not click the upload button,
and just save the whole page instead.
---

14cb2b0869496105915892b509016b9e46991ee7
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 4141cc04a..48cd954d9 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -52,7 +52,7 @@ sub formbuilder (@) { #{{{
 
 	return if $form->field("do") ne "edit";
 
-	if ($form->submitted eq "Upload") {
+	if ($form->submitted eq "Upload" || $form->submitted eq "Save Page") {
 		my $q=$params{cgi};
 		my $session=$params{session};
 
@@ -112,7 +112,6 @@ sub formbuilder (@) { #{{{
 				error("failed to get filehandle");
 			}
 			binmode($fh);
-			print STDERR "copying $filename\n";
 			writefile($filename, $config{srcdir}, undef, 1, sub {
 				IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
 			});
@@ -128,7 +127,6 @@ sub formbuilder (@) { #{{{
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
-		print STDERR "refreshing\n";
 		IkiWiki::refresh();
 		IkiWiki::saveindex();
 	}