From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 23 Mar 2008 21:39:03 +0000 (-0400)
Subject: inline: Allow the "feedshow" parameter to take values greater than the value for... 
X-Git-Tag: 2.41~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2911a20a6913e46035a8731acafba6faf5997f9;p=ikiwiki.git

inline: Allow the "feedshow" parameter to take values greater than the value for "show".
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 9b2caffcf..c734bd9a6 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -114,10 +114,14 @@ sub preprocess_inline (@) { #{{{
 	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
 	}
+	if (! exists $params{feedshow} && exists $params{show}) {
+		$params{feedshow}=$params{show};
+	}
 	my $desc;
 	if (exists $params{description}) {
 		$desc = $params{description} 
-	} else {
+	}
+	else {
 		$desc = $config{wikiname};
 	}
 	my $actions=yesno($params{actions});
@@ -157,6 +161,17 @@ sub preprocess_inline (@) { #{{{
 		@list=@list[$params{skip} .. scalar @list - 1];
 	}
 	
+	my @feedlist;
+	if ($feeds) {
+		if (exists $params{feedshow} &&
+		    $params{feedshow} && @list > $params{feedshow}) {
+			@feedlist=@list[0..$params{feedshow} - 1];
+		}
+		else {
+			@feedlist=@list;
+		}
+	}
+	
 	if ($params{show} && @list > $params{show}) {
 		@list=@list[0..$params{show} - 1];
 	}
@@ -165,7 +180,7 @@ sub preprocess_inline (@) { #{{{
 	# Explicitly add all currently displayed pages as dependencies, so
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
-	add_depends($params{page}, join(" or ", @list));
+	add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
 
 	my $feednum="";
 
@@ -287,11 +302,8 @@ sub preprocess_inline (@) { #{{{
 	}
 	
 	if ($feeds) {
-		if (exists $params{feedshow} && @list > $params{feedshow}) {
-			@list=@list[0..$params{feedshow} - 1];
-		}
 		if (exists $params{feedpages}) {
-			@list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
+			@feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
 		}
 	
 		if ($rss) {
@@ -300,7 +312,7 @@ sub preprocess_inline (@) { #{{{
 			if (! $params{preview}) {
 				writefile($rssp, $config{destdir},
 					genfeed("rss",
-						$config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
+						$config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
 				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
 			}
@@ -310,7 +322,7 @@ sub preprocess_inline (@) { #{{{
 			will_render($params{destpage}, $atomp);
 			if (! $params{preview}) {
 				writefile($atomp, $config{destdir},
-					genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
+					genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
 				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
 			}
diff --git a/debian/changelog b/debian/changelog
index 1b046b20c..a514c42d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   * Changed to a binary index file, written using Storable, for speed.
   * external: Work around XML RPC's lack of support for null by passing
     a special sentinal value.
+  * inline: Allow the "feedshow" parameter to take values greater than the
+    value for "show".
 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100