urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Joey Hess 2008-12-11 13:50:51 -05:00
parent a6a85fa444
commit 38f5e3ba69
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/inline.pm
View File

@ -232,6 +232,10 @@ sub preprocess_inline (@) { #{{{
# that if they are removed or otherwise changed, the inline will be # that if they are removed or otherwise changed, the inline will be
# sure to be updated. # sure to be updated.
add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist)); 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=""; my $feednum="";
@ -364,10 +368,6 @@ sub preprocess_inline (@) { #{{{
} }
if ($feeds) { if ($feeds) {
if (exists $params{feedpages}) {
@feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
}
if ($rss) { if ($rss) {
my $rssp=rsspage($params{destpage}).$feednum; my $rssp=rsspage($params{destpage}).$feednum;
will_render($params{destpage}, $rssp); will_render($params{destpage}, $rssp);