* Make the map plugin notice when pages in the map are deleted and update

  it.

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 5aa2852de0926e8dd1bd50fe36f6699a5bc1a60d..1194f6ed2a11ab1583257314abadd50277e38cef 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -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) {
+       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;

diff --git a/debian/changelog b/debian/changelog
index 66d14646603d3b38754e658b85fc480db2adb0ad..486ce16a0920f8a4c146b9b0cbebd6b41ec4feb3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ ikiwiki (2.5) UNRELEASED; urgency=low
     pagetemplate hook to work for that page.
   * Above change fixes the favicon plugin to work on edit pages.
   * Correct some issues with escaped preprocessor directives.
+  * Make the map plugin notice when pages in the map are deleted and update
+    it.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 20 Jul 2007 13:54:02 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 24 Jul 2007 20:58:19 -0400
 
 ikiwiki (2.4) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9ce93ec1bc71d51e62b76c944b7c0f9c4922274e..c3011d037ddb5472fa5b03869a788ac1a34a27db 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-16 01:17-0400\n"
+"POT-Creation-Date: 2007-07-24 21:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,34 +36,34 @@ msgstr ""
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:349
+#: ../IkiWiki/CGI.pm:350
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/CGI.pm:429 ../IkiWiki/Plugin/brokenlinks.pm:24
 #: ../IkiWiki/Plugin/inline.pm:184 ../IkiWiki/Plugin/opendiscussion.pm:17
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:91
 #: ../IkiWiki/Render.pm:171
 msgid "discussion"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:474
+#: ../IkiWiki/CGI.pm:475
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:492 ../IkiWiki/CGI.pm:507 ../IkiWiki/CGI.pm:518
-#: ../IkiWiki/CGI.pm:544 ../IkiWiki/CGI.pm:588
+#: ../IkiWiki/CGI.pm:493 ../IkiWiki/CGI.pm:509 ../IkiWiki/CGI.pm:521
+#: ../IkiWiki/CGI.pm:548 ../IkiWiki/CGI.pm:593
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:685
+#: ../IkiWiki/CGI.pm:691
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:717
+#: ../IkiWiki/CGI.pm:723
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""