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 52bac7c1e937ba87e2711ff41319e13a5cfd7814..d8e2f627150e62bdaa4c4ed80a80bb8731f971bb 100644 (file)
--- 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 a519631f2970e18eceb59fa53f8093ca7d3da165..164bfcecbecfe079deb8d6c72856cd00a9b8175d 100644 (file)
--- 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