From: Joey Hess <joey@kitenet.net>
Date: Mon, 11 Jul 2011 22:34:17 +0000 (-0400)
Subject: attachment: Bugfix to move upload attachments out of holding area when saving.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=258b75c4f787ec2709a1cb089f839333cbf4f071;p=ikiwiki.git

attachment: Bugfix to move upload attachments out of holding area when saving.
---

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 52bac7c1e..d8e2f6271 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -116,9 +116,10 @@ sub formbuilder_setup (@) {
 			$form->tmpl_param("attachments-class" => "toggleable-open");
 		}
 		
-		# Save attachments in holding area before previewing so
-		# they can be seen in the preview.
-		if ($form->submitted eq "Preview") {
+		# Save attachments in holding area before previewing and
+		# saving.
+		if ($form->submitted eq "Preview" ||
+		    $form->submitted eq "Save Page") {
 			attachments_save($form, $params{session});
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index a519631f2..164bfcecb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20110708) UNRELEASED; urgency=low
 
   * Add build dep on python-support. Closes: #633536
+  * attachment: Bugfix to move upload attachments out of holding area
+    when saving.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 11 Jul 2011 13:03:04 -0400