Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index cc977024d07ccc37f89b2d533e88d99123ab4075..625cfdfcaaa723a80f7c15e155d70d0583d2b9b7 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -68,12 +68,14 @@ sub preprocess (@) {
        }
 
        # Needs to update whenever a page is added or removed (or in some
        }
 
        # Needs to update whenever a page is added or removed (or in some

-       # cases, when its content changes, if show=title), so register a
-       # dependency.
-       add_depends($params{page}, $params{pages});
+       # cases, when its content changes, if show= is specified), so
+       # register a dependency.
+       add_depends($params{page}, $params{pages}, presence => ! exists $params{show});

        # Explicitly add all currently shown pages, to detect when pages
        # are removed.
        # Explicitly add all currently shown pages, to detect when pages
        # are removed.

-       add_depends($params{page}, [keys %mapitems]);
+       foreach my $item (keys %mapitems) {
+               add_depends($params{page}, $item, presence => ! exists $params{show});
+       }

 
        # Create the map.
        my $parent="";
 
        # Create the map.
        my $parent="";