* map: Recent changes caused unnecessary ul's to be inserted for items

  that were all at the same level, fix. Closes: #449285

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 65a6ed552e9b28ebf7abb516543e2575200a5aca..b08d78d76dc6752ee37012bb3df707eba7faefc4 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -61,6 +61,7 @@ sub preprocess (@) { #{{{
        my $parent="";
        my $indent=0;
        my $openli=0;
+       my $dummy=0;
        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
                $item=~s/^\Q$common_prefix\E\///
@@ -69,12 +70,14 @@ sub preprocess (@) { #{{{
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);
+                       last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }
+               $dummy=0;
                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";
@@ -91,6 +94,7 @@ sub preprocess (@) { #{{{
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {
+                               $dummy=1;
                                $p.="/".shift(@bits);
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")

diff --git a/debian/changelog b/debian/changelog
index 8f4c68f549967e43560a2d72eb9ddaea2e0dff8b..7fdb081403018d294edfc601050ef113a743a380 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ ikiwiki (2.12) UNRELEASED; urgency=low
     pages.
   * Don't truncate git commit messages to the first line in RecentChanges,
     show the full message.
+  * map: Recent changes caused unnecessary ul's to be inserted for items
+    that were all at the same level, fix. Closes: #449285
 
- -- Joey Hess <joeyh@debian.org>  Wed, 31 Oct 2007 18:34:51 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 07 Nov 2007 16:09:13 -0500
 
 ikiwiki (2.11) unstable; urgency=low