From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Dec 2008 18:50:51 +0000 (-0500)
Subject: move feedpages application up
X-Git-Tag: 2.71~161
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38f5e3ba6944ab67bff87fdbb2cc50606b806085;p=ikiwiki.git

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.
---

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);