From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 15 Jun 2008 23:08:24 +0000 (-0400)
Subject: bugfixes for show=title
X-Git-Tag: 2.51~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebb2b9cbda42eaff70f13303ad891c6f7aaddb33;p=ikiwiki.git

bugfixes for show=title

Can't sort by titles; the tree building logic requires that the list be
sorted by page name.

Setting linktext => $page is not the same as omitting it entirely. So some
contortions to only set linktext when the page name is not being shown.
---

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 22f75b9e5..5b6a843e7 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -31,7 +31,7 @@ sub preprocess (@) { #{{{
 				$mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
 			}
 			else {
-				$mapitems{$page}=$page;
+				$mapitems{$page}='';
 			}
 			# Check for a common prefix.
 			if (! defined $common_prefix) {
@@ -73,7 +73,8 @@ sub preprocess (@) { #{{{
 	my $openli=0;
 	my $dummy=0;
 	my $map = "<div class='map'>\n<ul>\n";
-	foreach my $item (sort { $mapitems{$a} cmp $mapitems{$b} } keys %mapitems) {
+	foreach my $item (sort keys %mapitems) {
+		my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
 		$item=~s/^\Q$common_prefix\E\///
 			if defined $common_prefix && length $common_prefix;
 		my $depth = ($item =~ tr/\//\//) + 1;
@@ -121,7 +122,7 @@ sub preprocess (@) { #{{{
 		$map .= "<li>"
 			.htmllink($params{page}, $params{destpage}, 
 				"/".$common_prefix."/".$item,
-				linktext => $mapitems{$item},
+				@linktext,
 				class => "mapitem", noimageinline => 1)
 			."\n";
 		$openli=1;