From d4ca3b3f50027d0dfd052f77ddcc4290ab0e6a81 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 23 Aug 2006 20:23:57 +0000 Subject: * Change order of linkify and preprocess; first preprocess and then linkify. This allows passing a wikilink inside a parameter to a preprocessor directive without it being expanded to html, and leaking out of the parameter, which had required some non-obvious use of triple-quoting to avoid. Note that any preprocessor plugins that output something that looks like a wikilink will now have it treated as such; AFAIK this doesn't change any behavior though except for the template plugin. * Enable preprocessor directives when previewing an edit. --- IkiWiki/Plugin/inline.pm | 4 ++-- IkiWiki/Plugin/sidebar.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'IkiWiki/Plugin') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 935b86b58..c712f7bb4 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -116,8 +116,8 @@ sub preprocess_inline (@) { #{{{ my $type=pagetype($file); if (defined $type) { $ret.="\n". - preprocess($page, $params{page}, linkify($page, $params{page}, + preprocess($page, $params{page}, filter($page, readfile(srcfile($file))))); } @@ -145,8 +145,8 @@ sub get_inline_content ($$) { #{{{ my $type=pagetype($file); if (defined $type) { return htmlize($type, - preprocess($page, $destpage, linkify($page, $destpage, + preprocess($page, $destpage, filter($page, readfile(srcfile($file)))))); } diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm index a68f5e1da..e0e81526f 100644 --- a/IkiWiki/Plugin/sidebar.pm +++ b/IkiWiki/Plugin/sidebar.pm @@ -29,8 +29,8 @@ sub sidebar_content ($) { #{{{ my $content=IkiWiki::readfile(IkiWiki::srcfile($sidebar_file)); return unless length $content; return IkiWiki::htmlize($sidebar_type, - IkiWiki::preprocess($sidebar_page, $page, IkiWiki::linkify($sidebar_page, $page, + IkiWiki::preprocess($sidebar_page, $page, IkiWiki::filter($sidebar_page, $content)))); } -- cgit v1.2.3