X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d63e043f0abf642ff4048cc20c6caf03db3e55fb..7a04e2d4161d2f23f92bc87e23349354c06e820b:/IkiWiki/Plugin/sidebar.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index f706480ca..c1146b7b4 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -22,7 +22,7 @@ sub getsetup () {
 		},
 		global_sidebars => {
 			type => "boolean",
-			examples => 1,
+			example => 1,
 			description => "show sidebar page on all pages?",
 			safe => 1,
 			rebuild => 1,
@@ -33,13 +33,11 @@ my %pagesidebar;
 
 sub preprocess (@) {
 	my %params=@_;
-	my $content=shift;
-	shift;
 
 	my $page=$params{page};
 	return "" unless $page eq $params{destpage};
 	
-	if (! defined $content) {
+	if (! defined $params{content}) {
 		$pagesidebar{$page}=undef;
 	}
 	else {
@@ -49,8 +47,7 @@ sub preprocess (@) {
 		$pagesidebar{$page}=
 			IkiWiki::htmlize($page, $page, $type,
 			IkiWiki::linkify($page, $page,
-			IkiWiki::preprocess($page, $page,
-			IkiWiki::filter($page, $page, $content))));
+			IkiWiki::preprocess($page, $page, $params{content})));
 	}
 
 	return "";
@@ -62,7 +59,7 @@ my $oldcontent;
 sub sidebar_content ($) {
 	my $page=shift;
 	
-	return $pagesidebar{$page} if defined $pagesidebar{$page};
+	return delete $pagesidebar{$page} if defined $pagesidebar{$page};
 
 	return if ! exists $pagesidebar{$page} && 
 		defined $config{global_sidebars} && ! $config{global_sidebars};
@@ -99,11 +96,10 @@ sub sidebar_content ($) {
 sub pagetemplate (@) {
 	my %params=@_;
 
-	my $page=$params{page};
 	my $template=$params{template};
-	
-	if ($template->query(name => "sidebar")) {
-		my $content=sidebar_content($page);
+	if ($params{destpage} eq $params{page} &&
+	    $template->query(name => "sidebar")) {
+		my $content=sidebar_content($params{destpage});
 		if (defined $content && length $content) {
 		        $template->param(sidebar => $content);
 		}