web commit by http://natalian.org/

[ikiwiki.git] / IkiWiki / Plugin / map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 96daf39fcdf9debd255eec245bba57d1432747fc..1194f6ed2a11ab1583257314abadd50277e38cef 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,7 +9,7 @@ package IkiWiki::Plugin::map;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
        hook(type => "preprocess", id => "map", call => \&preprocess);
@@ -19,18 +19,21 @@ sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
-       # Needs to update whenever a page is added or removed, so
-       # register a dependency.
-       add_depends($params{page}, $params{pages});
-       
        # Get all the items to map.
        my @mapitems = ();
-       foreach my $page (keys %links) {
-               if (pagespec_match($page, $params{pages})) {
+       foreach my $page (keys %pagesources) {
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
                        push @mapitems, $page;
                }
        }
 
+       # Needs to update whenever a page is added or removed, so
+       # register a dependency.
+       add_depends($params{page}, $params{pages});
+       # Explicitly add all currently shown pages, to detect when pages
+       # are removed.
+       add_depends($params{page}, join(" or ", @mapitems));
+
        # Create the map.
        my $indent=0;
        my $openli=0;
@@ -49,7 +52,8 @@ sub preprocess (@) { #{{{
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
-                       .htmllink($params{page}, $params{destpage}, $item) ."\n";
+                       .htmllink($params{page}, $params{destpage}, $item)
+                       ."\n";
                $openli=1;
        }
        while ($indent > 0) {