From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 31 Jul 2009 08:23:06 +0000 (+0200)
Subject: Merge commit 'remotes/smcv/ready/harishcm-map-fix' into staging
X-Git-Tag: 3.15~70
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=0bbb3d201e9d3f27c537e415be4284877fd8eac7;hp=80c66c128bdc25a84e929b17dd7e674250872917

Merge commit 'remotes/smcv/ready/harishcm-map-fix' into staging
---

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 120451b5d..826dbbd66 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -80,7 +80,17 @@ sub preprocess (@) {
 	my $indent=0;
 	my $openli=0;
 	my $addparent="";
-	my $map = "<div class='map'>\n<ul>\n";
+	my $map = "<div class='map'>\n";
+
+	# Return empty div if %mapitems is empty
+	if (!scalar(keys %mapitems)) {
+		$map .= "</div>\n";
+		return $map; 
+	} 
+	else { # continue populating $map
+		$map .= "<ul>\n";
+	}
+
 	foreach my $item (sort keys %mapitems) {
 		my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
 		$item=~s/^\Q$common_prefix\E\///