Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 7c2e6e1f680a28561cf0282f0ff631afd76b034b..746fa93bb3bcaf754f0d749f865f7d55906acb1d 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -8,11 +8,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
 use strict;
 use IkiWiki 2.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;


@@ -33,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};


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

-} # }}}
+}

 
 1
 
 1