diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-04-15 17:50:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-04-15 17:50:43 -0400 |
| commit | 4c6f5a48bcfc2462a915387515bfa39b9239a7da (patch) | |
| tree | aa87f1182c0b5e3f133b279f1c94bd0d4e89ee30 | |
| parent | 4bbbd77a48f9c3188c97637d4d4b0d503fc1738e (diff) | |
| download | ikiwiki-4c6f5a48bcfc2462a915387515bfa39b9239a7da.tar ikiwiki-4c6f5a48bcfc2462a915387515bfa39b9239a7da.tar.gz | |
fix sidebar directive parameter handling
| -rw-r--r-- | IkiWiki/Plugin/sidebar.pm | 6 | ||||
| -rw-r--r-- | 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/*"]] |