diff options
author | Simon McVittie <smcv@debian.org> | 2012-03-18 17:11:05 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2012-03-18 17:11:05 +0000 |
commit | 63bb8b42f76e350cdf7a1256ad0fe7ad63199f63 (patch) | |
tree | b543521f8e9f51a90e1fa5c7b01a63a5ea740a9c /IkiWiki/Plugin/inline.pm | |
parent | dc3b9934d5660a085d9b5e041b7e8749493b9360 (diff) | |
download | ikiwiki-63bb8b42f76e350cdf7a1256ad0fe7ad63199f63.tar ikiwiki-63bb8b42f76e350cdf7a1256ad0fe7ad63199f63.tar.gz |
Replace [[!trailinline]] directive with [[!inline trail=yes]]
Diffstat (limited to 'IkiWiki/Plugin/inline.pm')
-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 159cc5def..3dc410c27 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}; |