htmlscrubber: Do not scrub url anchors that contain colons.

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 728bbc399fe8b50e247318158a57bd5c2facad96..bbd2c5752f58ac4aa94dc932ac4345a5226266a7 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -9,6 +9,7 @@ use IkiWiki 3.00;
 sub import {
        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
 sub import {
        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);

+       hook(type => "getsetup", id => "parentlinks", call => \&getsetup);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -23,6 +24,14 @@ sub getsetup () {
 sub parentlinks ($) {
        my $page=shift;
 
 sub parentlinks ($) {
        my $page=shift;
 

+       if (! length $page) {
+               # dynamic page
+               return {
+                       url => $config{url},
+                       page => $config{wikiname},
+               };
+       }
+

        my @ret;
        my $path="";
        my $title=$config{wikiname};
        my @ret;
        my $path="";
        my $title=$config{wikiname};


@@ -53,12 +62,11 @@ sub parentlinks ($) {
 
 sub pagetemplate (@) {
        my %params=@_;
 
 sub pagetemplate (@) {
        my %params=@_;

-        my $page=$params{page};

         my $template=$params{template};
 
        if ($template->query(name => "parentlinks") ||
           $template->query(name => "has_parentlinks")) {
         my $template=$params{template};
 
        if ($template->query(name => "parentlinks") ||
           $template->query(name => "has_parentlinks")) {

-               my @links=parentlinks($page);
+               my @links=parentlinks($params{page});

                $template->param(parentlinks => \@links);
                $template->param(has_parentlinks => (@links > 0));
        }
                $template->param(parentlinks => \@links);
                $template->param(has_parentlinks => (@links > 0));
        }