web commit from 217.16.16.218: poll vote (Accept only password logins)

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 93ff3194a53d57eaff8b11dd2e26b1faf1354371..65a6ed552e9b28ebf7abb516543e2575200a5aca 100644 (file)
--- 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.
        }
        
        # 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);
        }
 
                $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) {
        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(\/|$)/) {
                my $depth = ($item =~ tr/\//\//) + 1;
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {