releasing version 3.141

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

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index a49726768762ac51f8b950630d104d2fd69c3e54..41812e1c1f671da84be1a06a5821695fc5dc6f11 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -6,13 +6,22 @@ package IkiWiki::Plugin::sidebar;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "sidebar", call => \&getsetup);

        hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
        hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);

-} # }}}
+}

 
 

-sub sidebar_content ($) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub sidebar_content ($) {

        my $page=shift;
        
        my $sidebar_page=bestlink($page, "sidebar") || return;
        my $page=shift;
        
        my $sidebar_page=bestlink($page, "sidebar") || return;


@@ -27,15 +36,15 @@ sub sidebar_content ($) { #{{{
 
                my $content=readfile(srcfile($sidebar_file));
                return unless length $content;
 
                my $content=readfile(srcfile($sidebar_file));
                return unless length $content;

-               return IkiWiki::htmlize($page, $sidebar_type,
+               return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,

                       IkiWiki::linkify($sidebar_page, $page,
                       IkiWiki::preprocess($sidebar_page, $page,
                       IkiWiki::filter($sidebar_page, $page, $content))));
        }
 
                       IkiWiki::linkify($sidebar_page, $page,
                       IkiWiki::preprocess($sidebar_page, $page,
                       IkiWiki::filter($sidebar_page, $page, $content))));
        }
 

-} # }}}
+}

 
 

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

        my %params=@_;
 
        my $page=$params{page};
        my %params=@_;
 
        my $page=$params{page};


@@ -47,6 +56,6 @@ sub pagetemplate (@) { #{{{
                        $template->param(sidebar => $content);
                }
        }
                        $template->param(sidebar => $content);
                }
        }

-} # }}}
+}

 
 1
 
 1