diff options
| -rw-r--r-- | IkiWiki/Plugin/template.pm | 1 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 2 | ||||
| -rw-r--r-- | doc/index.mdwn | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 5b4eeb3a8..7e23306cb 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -44,7 +44,6 @@ sub preprocess (@) { #{{{ $template->param($param => $params{$param}); } - return IkiWiki::preprocess($params{page}, $params{destpage}, $template->output); } # }}} diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 38bfcdfcb..d988e0956 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -104,7 +104,7 @@ sub preprocess ($$$;$) { #{{{ # Note: preserve order of params, some plugins may # consider it significant. my @params; - while ($params =~ /(?:(\w+)=)?(?:"""(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/g) { + while ($params =~ /(?:(\w+)=)?(?:"""(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) { if (defined $1) { push @params, $1, (defined $2 ? $2 : (defined $3 ? $3 : $4)); } diff --git a/doc/index.mdwn b/doc/index.mdwn index 8258dcca4..2f78f11aa 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -12,7 +12,7 @@ Instead it can use [[Subversion]] (or [[Git]]). and thoughts about ikiwiki to [[Discussion]]. [[template id=note text=""" -If you use ikiwiki, please list your wiki in IkiWikiUsers. Thanks! +If you use ikiwiki, please list your wiki in [[IkiWikiUsers]]. Thanks! """]] * [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents |