From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 23 Aug 2008 16:48:01 +0000 (-0400)
Subject: fix my broken fix
X-Git-Tag: 2.62~59
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d84e43faacbeb1e43224aa65d5ea8c19e657779e;p=ikiwiki.git

fix my broken fix
---

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 44fda73ca..4c2a15b01 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -88,6 +88,7 @@ sub preprocess (@) { #{{{
 			if defined $common_prefix && length $common_prefix;
 		my $depth = ($item =~ tr/\//\//) + 1;
 		my $baseitem=IkiWiki::dirname($item);
+		print STDERR "!! parent: $parent baseitem: $baseitem\n";
 		while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
 			$parent=IkiWiki::dirname($parent);
 			last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
@@ -106,18 +107,19 @@ sub preprocess (@) { #{{{
 			}
 		}
 		my @bits=split("/", $item);
+		my $p="";
+		$p.="/".shift(@bits) for 1..$indent;
 		while ($depth > $indent) {
 			$indent++;
 			if ($indent > 1) {
 				$map .= "<ul>\n";
 			}
 			if ($depth > $indent) {
-				my $p="";
-				$p.="/".shift(@bits) for 1..$indent;
-				$p=~s/^\///;
+				$p.="/".shift(@bits);
+				#$p=~s/^\///;
 				$map .= "<li>"
 					.htmllink($params{page}, $params{destpage},
-						 "/".$common_prefix."/".$p, class => "mapparent",
+						 "/".$common_prefix.$p, class => "mapparent",
 						 noimageinline => 1)
 					."\n";
 				$openli=1;