X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d4254c7f97cacffe500c3a9b6c1d887ebd3687fb..5674e7fc1273800554c23ad6194e8a06dee851ae:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index e6f7e1dbd..3e9f9b82f 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -119,17 +119,16 @@ sub removal_confirm ($$@) {
 	my @pages=@_;
 		
 	# Special case for unsaved attachments.
-	@pages=grep {
-		if (IkiWiki::Plugin::attachment->can("is_held_attachment")) {
-			my $f=IkiWiki::Plugin::attachment::is_held_attachment($_);
+	foreach my $page (@pages) {
+		if ($attachment && IkiWiki::Plugin::attachment->can("is_held_attachment")) {
+			my $f=IkiWiki::Plugin::attachment::is_held_attachment($page);
 			if (defined $f) {
 				require IkiWiki::Render;
-				IkiWiki::prune($f);
-				0;
+				IkiWiki::prune($f, "$config{wikistatedir}/attachments");
 			}
 		}
-		1;
-	} @pages;
+	}
+	@pages=grep { exists $pagesources{$_} } @pages;
 	return unless @pages;
 
 	foreach my $page (@pages) {
@@ -236,7 +235,7 @@ sub sessioncgi ($$) {
 			}
 			else {
 				foreach my $file (@files) {
-					IkiWiki::prune("$config{srcdir}/$file");
+					IkiWiki::prune("$config{srcdir}/$file", $config{srcdir});
 				}
 			}
 			IkiWiki::refresh();