diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-12-11 13:50:51 -0500 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-12-11 13:58:40 -0500 |
commit | 38f5e3ba6944ab67bff87fdbb2cc50606b806085 (patch) | |
tree | 28a43c84b1b66e22196f4febcea471e8fac9142e /IkiWiki | |
parent | a6a85fa4446e1bdac6220ab40226ca34c13e5381 (diff) |
move feedpages application up
I wanted this nearer to the top, but decided to put it after the
add_depends. Reasoning: It's possible with a combinaton of feedpages and
show options to make @list and @feedlist contain completly differing sets
of pages. We want to add_depends all pages in both sets. We could combine
the two lists and add_depends that, but it's slightly more efficient to
defer reducing @feedlist, and add_depends whichever list is longer.
Diffstat (limited to 'IkiWiki')
-rw-r--r-- | IkiWiki/Plugin/inline.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 7fe5a4dcf..0c8f50384 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -232,6 +232,10 @@ sub preprocess_inline (@) { #{{{ # that if they are removed or otherwise changed, the inline will be # sure to be updated. add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist)); + + if ($feeds && exists $params{feedpages}) { + @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist; + } my $feednum=""; @@ -364,10 +368,6 @@ sub preprocess_inline (@) { #{{{ } if ($feeds) { - if (exists $params{feedpages}) { - @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist; - } - if ($rss) { my $rssp=rsspage($params{destpage}).$feednum; will_render($params{destpage}, $rssp); |