From: Simon McVittie <smcv@debian.org>
Date: Fri, 29 Jul 2011 19:46:42 +0000 (+0100)
Subject: Revert "map: don't create useless </ul><ul> sequences"
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ce1c7a3eab5fb2a0bcf639171a4f2dd2ef981963

Revert "map: don't create useless </ul><ul> sequences"

This reverts commit 2d5c2f301c04a3daa3164a2df70899fa2c1aaa38.
---

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 38f090ff7..ce3ac1d24 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -94,9 +94,8 @@ sub preprocess (@) {
 			if defined $common_prefix && length $common_prefix;
 		my $depth = ($item =~ tr/\//\//) + 1;
 		my $baseitem=IkiWiki::dirname($item);
-		my $parentbase=IkiWiki::dirname($parent);
-		while (length $parentbase && length $baseitem && $baseitem !~ /^\Q$parentbase\E(\/|$)/) {
-			$parentbase=IkiWiki::dirname($parentbase);
+		while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
+			$parent=IkiWiki::dirname($parent);
 			last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
 			$addparent="";
 			$indent--;
@@ -114,10 +113,14 @@ sub preprocess (@) {
 		}
 		my @bits=split("/", $item);
 		my $p="";
-		$indent++  unless length $parent;
 		$p.="/".shift(@bits) for 1..$indent;
 		while ($depth > $indent) {
-			if (@bits && !(length $parent && "/$parent" eq $p)) {
+			$indent++;
+			if ($indent > 1) {
+				$map .= "<ul>\n";
+			}
+			if ($depth > $indent) {
+				$p.="/".shift(@bits);
 				$addparent=$p;
 				$addparent=~s/^\///;
 				$map .= "<li>"
@@ -130,11 +133,6 @@ sub preprocess (@) {
 			else {
 				$openli=0;
 			}
-			$indent++;
-			$p.="/".shift(@bits) if @bits;
-			if ($indent > 1) {
-				$map .= "<ul>\n";
-			}
 		}
 		$map .= "</li>\n" if $openli;
 		$map .= "<li>"