editpage: Be more aggressive (and less buggy) about cleaning up temporary files rende...

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index f1a9b19394701ea82558513ecc423b451ba2ddc4..8379928418fd997922a574bc59f68c79415251d4 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -181,8 +181,7 @@ sub formbuilder (@) { #{{{
                        }
                }
 
                        }
                }
 

-               $filename=IkiWiki::linkpage(
-                       IkiWiki::possibly_foolish_untaint(
+               $filename=linkpage(IkiWiki::possibly_foolish_untaint(

                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));
                if (IkiWiki::file_pruned($filename, $config{srcdir})) {
                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));
                if (IkiWiki::file_pruned($filename, $config{srcdir})) {


@@ -271,7 +270,7 @@ sub attachment_list ($) { #{{{
 
        my @ret;
        foreach my $f (values %pagesources) {
 
        my @ret;
        foreach my $f (values %pagesources) {

-               if (! defined IkiWiki::pagetype($f) &&
+               if (! defined pagetype($f) &&

                    $f=~m/^\Q$loc\E[^\/]+$/ &&
                    -e "$config{srcdir}/$f") {
                        push @ret, {
                    $f=~m/^\Q$loc\E[^\/]+$/ &&
                    -e "$config{srcdir}/$f") {
                        push @ret, {