X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7351d545d96df3c1359312b1a5b79530fa6ab4fd..2ff3c8aee78114974b6930c18247f050d35f2012:/IkiWiki/Plugin/attachment.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index f1a9b1939..837992841 100644 --- 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})) { @@ -271,7 +270,7 @@ sub attachment_list ($) { #{{{ 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, {