Merge branch 'master' into templatemove

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

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index f706480caabaf3f39855e03ec26f6ee627fcd226..0350f2b71d7fc20695c169daa4ef967e591b22fe 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -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 {
@@ -50,7 +48,7 @@ sub preprocess (@) {
                        IkiWiki::htmlize($page, $page, $type,
                        IkiWiki::linkify($page, $page,
                        IkiWiki::preprocess($page, $page,
-                       IkiWiki::filter($page, $page, $content))));
+                       IkiWiki::filter($page, $page, $params{content}))));
        }
 
        return "";
@@ -62,7 +60,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 +97,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);
                }