finish merging getsource

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

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 9697e1198d24db690cec373e9980516e077ad936..41812e1c1f671da84be1a06a5821695fc5dc6f11 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -6,22 +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 => "getsetup", id => "sidebar", call => \&getsetup);
        hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

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

-} #}}}
+}

 
 

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

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


@@ -42,9 +42,9 @@ sub sidebar_content ($) { #{{{
                       IkiWiki::filter($sidebar_page, $page, $content))));
        }
 
                       IkiWiki::filter($sidebar_page, $page, $content))));
        }
 

-} # }}}
+}

 
 

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

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


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

-} # }}}
+}

 
 1
 
 1