external: Fix pagespec_match and pagespec_match_list. Closes: #527281

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 6ba37615e08cbffcd0f1a4169e75bb47ca47db70..cf74c9b794bb4977d0ed8eb17fbc6e36ed045ba0 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,13 +4,22 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

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

        hook(type => "preprocess", id => "orphans", call => \&preprocess);
        hook(type => "preprocess", id => "orphans", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        


@@ -25,21 +34,31 @@ sub preprocess (@) { #{{{
        }
        
        my @orphans;
        }
        
        my @orphans;

-       foreach my $page (keys %renderedfiles) {
-               next if $linkedto{$page};
-               next unless pagespec_match($page, $params{pages});
+       my $discussion=gettext("discussion");
+       foreach my $page (pagespec_match_list(
+                       [ grep { ! $linkedto{$_} && $_ ne 'index' }
+                               keys %pagesources ],
+                       $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 { 
                        length $_ &&
                # 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 { 
                        length $_ &&

-                       ($_ !~ /\/Discussion$/i || ! $config{discussion}) &&
-                       bestlink($page, $_) !~ /^($page|)$/ 
+                       ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
+                       bestlink($page, $_) !~ /^(\Q$page\E|)$/ 

                } @{$links{$page}};
                push @orphans, $page;
        }
        
        return gettext("All pages are linked to by other pages.") unless @orphans;
                } @{$links{$page}};
                push @orphans, $page;
        }
        
        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