Merge branch 'master' into cvs

[git.ikiwiki.info.git] / IkiWiki / Plugin / remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 5e5b83349b63dd6b5790023dcbd0b302bffa8c8d..14ac01c9bcfc390f370f1a8fca74c3b51d7f0baa 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -119,10 +119,16 @@ sub removal_confirm ($$@) {
        my @pages=@_;
                
        # Special case for unsaved attachments.
        my @pages=@_;
                
        # Special case for unsaved attachments.

-       @pages=grep {
-               ! (IkiWiki::Plugin::attachment->can("remove_held_attachment") &&
-                  IkiWiki::Plugin::attachment::remove_held_attachment($_))
-       } @pages;
+       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);
+                       }
+               }
+       }
+       @pages=grep { exists $pagesources{$_} } @pages;

        return unless @pages;
 
        foreach my $page (@pages) {
        return unless @pages;
 
        foreach my $page (@pages) {