From 4c6f5a48bcfc2462a915387515bfa39b9239a7da Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:50:43 -0400
Subject: [PATCH] fix sidebar directive parameter handling
---
IkiWiki/Plugin/sidebar.pm | 6 ++----
doc/ikiwiki/directive/sidebar.mdwn | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index f706480ca..808f0bed2 100644
--- 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 401d7c786..599695d22 100644
--- 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/*"]]
--
2.39.5