diff options
author | Simon McVittie <smcv@debian.org> | 2012-04-05 09:43:44 +0100 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2012-04-05 09:43:44 +0100 |
commit | 276ab9a78a0577ddd11f0e8e419149c6241af90e (patch) | |
tree | b0ac589f27c49bcdda1c2a0e898c0f6a2b842542 /IkiWiki | |
parent | 0a23666ddd446fea64bd9ddb0e11d33643a3fedf (diff) | |
download | ikiwiki-276ab9a78a0577ddd11f0e8e419149c6241af90e.tar ikiwiki-276ab9a78a0577ddd11f0e8e419149c6241af90e.tar.gz |
Reinstate trail support in inline
This was removed in aaa72a3a80f89.
Diffstat (limited to 'IkiWiki')
-rw-r--r-- | IkiWiki/Plugin/inline.pm | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 3b49152f4..a50c4b7b7 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -19,7 +19,7 @@ sub import { hook(type => "checkconfig", id => "inline", call => \&checkconfig); hook(type => "sessioncgi", id => "inline", call => \&sessioncgi); hook(type => "preprocess", id => "inline", - call => \&IkiWiki::preprocess_inline); + call => \&IkiWiki::preprocess_inline, scan => 1); hook(type => "pagetemplate", id => "inline", call => \&IkiWiki::pagetemplate_inline); hook(type => "format", id => "inline", call => \&format, first => 1); @@ -155,6 +155,23 @@ sub preprocess_inline (@) { if (! exists $params{pages} && ! exists $params{pagenames}) { error gettext("missing pages parameter"); } + + if (! defined wantarray) { + # Running in scan mode: only do the essentials + + if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) { + # default to sorting age, the same as inline itself, + # but let the params override that + IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age', %params); + } + + return; + } + + if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) { + scalar IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age', %params); + } + my $raw=yesno($params{raw}); my $archive=yesno($params{archive}); my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss}; |