Fix escaping of filenames in historyurl. (Thanks, aj)

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 9095dabdaf176726b6a514e9edb605c8d06eb4e3..bbd2c5752f58ac4aa94dc932ac4345a5226266a7 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -4,24 +4,34 @@ package IkiWiki::Plugin::parentlinks;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
        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 () {

        return 
                plugin => {
                        safe => 1,
                        rebuild => 1,
        return 
                plugin => {
                        safe => 1,
                        rebuild => 1,

+                       section => "core",

                },
                },

-} #}}}
+}

 
 

-sub parentlinks ($) { #{{{
+sub parentlinks ($) {

        my $page=shift;
 
        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};


@@ -48,16 +58,18 @@ sub parentlinks ($) { #{{{
                $i++;
        }
        return @ret;
                $i++;
        }
        return @ret;

-} #}}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
        my %params=@_;

-        my $page=$params{page};

         my $template=$params{template};
 
         my $template=$params{template};
 

-       if ($template->query(name => "parentlinks")) {
-               $template->param(parentlinks => [parentlinks($page)]);
+       if ($template->query(name => "parentlinks") ||
+          $template->query(name => "has_parentlinks")) {
+               my @links=parentlinks($params{page});
+               $template->param(parentlinks => \@links);
+               $template->param(has_parentlinks => (@links > 0));

        }
        }

-} # }}}
+}

 
 1
 
 1