fix sidebar directive parameter handling

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index f706480caabaf3f39855e03ec26f6ee627fcd226..808f0bed29d8dea4349874109b53e109501f6511 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 "";

diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 401d7c786c7ceb8e5bfcce270cb0e131ecab944c..599695d22e45efb687d70acf2df2e5f0c234c9d5 100644 (file)
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -9,7 +9,7 @@ used to disable use of the sidebar page by default.
 
 ## examples
 
-       \[[!sidebar """
+       \[[!sidebar content="""
        This is my custom sidebar for this page.
 
        \[[!calendar pages="posts/*"]]