aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-23 06:08:12 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-23 06:08:12 +0000
commit7c66edacd864bdb1a7c657b6131f53666fc0675b (patch)
tree3fd557fa6d253acbf0e81d28f496e507638f72f6 /IkiWiki
parentf27bf9e4006c55b45624d6fbb47dc3c625f919b9 (diff)
downloadikiwiki-7c66edacd864bdb1a7c657b6131f53666fc0675b.tar
ikiwiki-7c66edacd864bdb1a7c657b6131f53666fc0675b.tar.gz
update
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Render.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d988e0956..5351ee7ad 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -104,12 +104,14 @@ sub preprocess ($$$;$) { #{{{
# Note: preserve order of params, some plugins may
# consider it significant.
my @params;
- while ($params =~ /(?:(\w+)=)?(?:"""(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) {
+ while ($params =~ /(?:(\w+)=)?(?:"""\n?(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) {
+ my $val=(defined $2 ? $2 : (defined $3 ? $3 : $4));
+ chomp $val;
if (defined $1) {
- push @params, $1, (defined $2 ? $2 : (defined $3 ? $3 : $4));
+ push @params, $1, $val;
}
else {
- push @params, (defined $2 ? $2 : (defined $3 ? $3 : $4)), '';
+ push @params, $val, '';
}
}
return $hooks{preprocess}{$command}{call}->(