Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / IkiWiki / Plugin / map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index f7ab291c7b1222b374c37b9629ff5229e2b81735..5b6a843e7ae2680d654317fc35368190c2d9d087 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -26,11 +26,12 @@ sub preprocess (@) { #{{{
        foreach my $page (keys %pagesources) {
                if (pagespec_match($page, $params{pages}, location => $params{page})) {
                        if (exists $params{show} && 
        foreach my $page (keys %pagesources) {
                if (pagespec_match($page, $params{pages}, location => $params{page})) {
                        if (exists $params{show} && 

+                           exists $pagestate{$page} &&

                            exists $pagestate{$page}{meta}{$params{show}}) {
                                $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
                        }
                        else {
                            exists $pagestate{$page}{meta}{$params{show}}) {
                                $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
                        }
                        else {

-                               $mapitems{$page}=$page;
+                               $mapitems{$page}='';

                        }
                        # Check for a common prefix.
                        if (! defined $common_prefix) {
                        }
                        # Check for a common prefix.
                        if (! defined $common_prefix) {


@@ -72,7 +73,8 @@ sub preprocess (@) { #{{{
        my $openli=0;
        my $dummy=0;
        my $map = "<div class='map'>\n<ul>\n";
        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;
                $item=~s/^\Q$common_prefix\E\///
                        if defined $common_prefix && length $common_prefix;
                my $depth = ($item =~ tr/\//\//) + 1;


@@ -120,7 +122,7 @@ sub preprocess (@) { #{{{
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item,
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item,

-                               linktext => $mapitems{$item},
+                               @linktext,

                                class => "mapitem", noimageinline => 1)
                        ."\n";
                $openli=1;
                                class => "mapitem", noimageinline => 1)
                        ."\n";
                $openli=1;