cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index def8e92d67eb7440c4a22f9ecf61211b9c65893b..3a0150d53e4c52b08fe076bf276c1bb2e6e563dd 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "preprocess", id => "orphans", call => \&preprocess);
 
 sub import { #{{{
        hook(type => "preprocess", id => "orphans", call => \&preprocess);


@@ -26,9 +26,9 @@ sub preprocess (@) { #{{{
        
        my @orphans;
        my $discussion=gettext("discussion");
        
        my @orphans;
        my $discussion=gettext("discussion");

-       foreach my $page (keys %renderedfiles) {
+       foreach my $page (keys %pagesources) {

                next if $linkedto{$page};
                next if $linkedto{$page};

-               next unless pagespec_match($page, $params{pages});
+               next unless pagespec_match($page, $params{pages}, location => $params{page});

                # If the page has a link to some other page, it's
                # indirectly linked to a page via that page's backlinks.
                next if grep { 
                # If the page has a link to some other page, it's
                # indirectly linked to a page via that page's backlinks.
                next if grep { 


@@ -40,7 +40,15 @@ sub preprocess (@) { #{{{
        }
        
        return gettext("All pages are linked to by other pages.") unless @orphans;
        }
        
        return gettext("All pages are linked to by other pages.") unless @orphans;

-       return "<ul>\n".join("\n", map { "<li>".htmllink($params{page}, $params{destpage}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
+       return "<ul>\n".
+               join("\n",
+                       map {
+                               "<li>".
+                               htmllink($params{page}, $params{destpage}, $_,
+                                        noimageinline => 1).
+                               "</li>"
+                       } sort @orphans).
+               "</ul>\n";

 } # }}}
 
 1
 } # }}}
 
 1