X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..9abda92324e2ae17a7437d7c0dded39cf4462649:/IkiWiki/Plugin/sidebar.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index da1f82b82..41812e1c1 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -6,13 +6,22 @@ package IkiWiki::Plugin::sidebar;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
 	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;
@@ -27,15 +36,15 @@ sub sidebar_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, $content))));
+		       IkiWiki::filter($sidebar_page, $page, $content))));
 	}
 
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 
 	my $page=$params{page};
@@ -47,6 +56,6 @@ sub pagetemplate (@) { #{{{
 		        $template->param(sidebar => $content);
 		}
 	}
-} # }}}
+}
 
 1