X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7bde880fa8cf2e7d3413a7ede7ae5b604a97e85b..f9d898fe21ce1fdfa3e5c3815c17ef605839b2ed:/IkiWiki/Plugin/map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 97450eb6d..65a6ed552 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -45,7 +45,8 @@ sub preprocess (@) { #{{{
 	}
 	
 	# Common prefix should not be a page in the map.
-	while (length $common_prefix && exists $mapitems{$common_prefix}) {
+	while (defined $common_prefix && length $common_prefix &&
+	       exists $mapitems{$common_prefix}) {
 		$common_prefix=IkiWiki::dirname($common_prefix);
 	}
 
@@ -62,7 +63,8 @@ sub preprocess (@) { #{{{
 	my $openli=0;
 	my $map = "<div class='map'>\n<ul>\n";
 	foreach my $item (sort keys %mapitems) {
-		$item=~s/^\Q$common_prefix\E\/// if length $common_prefix;
+		$item=~s/^\Q$common_prefix\E\///
+			if defined $common_prefix && length $common_prefix;
 		my $depth = ($item =~ tr/\//\//) + 1;
 		my $baseitem=IkiWiki::dirname($item);
 		while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
@@ -92,7 +94,7 @@ sub preprocess (@) { #{{{
 				$p.="/".shift(@bits);
 				$map .= "<li>"
 					.htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
-					."</span>\n";
+					."\n";
 				$openli=1;
 			}
 			else {
@@ -103,7 +105,7 @@ sub preprocess (@) { #{{{
 		$map .= "<li>"
 			.htmllink($params{page}, $params{destpage}, 
 				"/".$common_prefix."/".$item, class => "mapitem")
-			."</span>\n";
+			."\n";
 		$openli=1;
 		$parent=$item;
 	}