Embed comments into comments_embed.tmpl rather than concatenating in perl

master
Simon McVittie 2008-11-23 12:02:39 +00:00
parent 3a46e7c7f1
commit 430ac61f21
1 changed files with 4 additions and 3 deletions

View File

@ -69,8 +69,8 @@ sub preprocess (@) { #{{{
debug("page $params{page} => destpage $params{destpage}"); debug("page $params{page} => destpage $params{destpage}");
my $posts = '';
unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) { unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
my $posts = '';
eval q{use IkiWiki::Plugin::inline}; eval q{use IkiWiki::Plugin::inline};
error($@) if ($@); error($@) if ($@);
my @args = ( my @args = (
@ -89,10 +89,11 @@ sub preprocess (@) { #{{{
push @args, feedshow => $params{feedshow} if defined $params{feedshow}; push @args, feedshow => $params{feedshow} if defined $params{feedshow};
push @args, timeformat => $params{timeformat} if defined $params{timeformat}; push @args, timeformat => $params{timeformat} if defined $params{timeformat};
push @args, feedonly => $params{feedonly} if defined $params{feedonly}; push @args, feedonly => $params{feedonly} if defined $params{feedonly};
$posts = "\n" . IkiWiki::preprocess_inline(@args); $posts = IkiWiki::preprocess_inline(@args);
$formtemplate->param("comments" => $posts);
} }
return $formtemplate->output . $posts; return $formtemplate->output;
} # }}} } # }}}
# FIXME: logic taken from editpage, should be common code? # FIXME: logic taken from editpage, should be common code?