From: Joey Hess <joey@kitenet.net>
Date: Tue, 12 Jul 2011 01:35:46 +0000 (-0400)
Subject: attachment: Bugfix to create directory when moving attachment out of  holding area.
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/d23786cb6c5b3320d4b0c45df3424acea51e90ad

attachment: Bugfix to create directory when moving attachment out of  holding area.
---

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index d8e2f6271..fd4096edf 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -273,11 +273,13 @@ sub attachments_save {
 	my $dir=attachment_holding_location($form->field('page'));
 	foreach my $filename (glob("$dir/*")) {
 		next unless -f $filename;
-		my $dest=$config{srcdir}."/".
+		my $destdir=$config{srcdir}."/".
 			linkpage(IkiWiki::possibly_foolish_untaint(
-				attachment_location($form->field('page')))).
-			IkiWiki::basename($filename);
+				attachment_location($form->field('page'))));
+		my $destfile=IkiWiki::basename($filename);
+		my $dest=$destdir.$destfile;
 		unlink($dest);
+		IkiWiki::prep_writefile($destfile, $destdir);
 		rename($filename, $dest);
 		push @attachments, $dest;
 	}
diff --git a/debian/changelog b/debian/changelog
index 498857cad..6ef9650b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20110712) UNRELEASED; urgency=low
+
+  * attachment: Bugfix to create directory when moving attachment out of 
+    holding area.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 11 Jul 2011 21:35:20 -0400
+
 ikiwiki (3.20110711) unstable; urgency=low
 
   * Add build dep on python-support. Closes: #633536