From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 1 Jan 2010 20:09:15 +0000 (-0500)
Subject: inline: Fix bug that limited displayed pages when feedshow was specified w/o show.
X-Git-Tag: 3.20100102.3~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/63cc5384bb4bd6a033ff85821b1bb904150d76c2?ds=inline;hp=-c

inline: Fix bug that limited displayed pages when feedshow was specified w/o show.
---

63cc5384bb4bd6a033ff85821b1bb904150d76c2
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 93dc0149e..17d1611db 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -209,7 +209,7 @@ sub preprocess_inline (@) {
 		if ($params{show}) {
 			$num=$params{show};
 		}
-		if ($params{feedshow} && $num < $params{feedshow}) {
+		if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {
 			$num=$params{feedshow};
 		}
 		if ($params{skip} && $num) {
diff --git a/debian/changelog b/debian/changelog
index eb9bf496f..4ad346c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
     avoid merge conflicts when comments are posted to two branches of a
     site.
   * linkmap: Add option to omit disconnected pages from the map.
+  * inline: Fix bug that limited displayed pages when feedshow was
+    specified w/o show.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index c0d7c76c6..998ba642b 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -132,9 +132,7 @@ Else can you please suggest a smarter way of getting certain data out from pages
 Reading the documentation I would think that `feedshow` does not
 influence `show`.
 
-	 [[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
-
-> Somehow the line above is not displayed correctly.
+	\[[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
 
 Only ten pages are listed in this example although `archive` is set to
 yes. Removing `feedshow=10` all matching pages are shown.
@@ -144,3 +142,5 @@ Is that behaviour intended?
 > Is something going wrong because `quick="yes"` [[»turns off generation of any feeds«|inline]]? --[[PaulePanter]]
 
 --[[PaulePanter]]
+
+>> Bug was that if feedshow was specified without show it limited to it incorrectly. Fixed. --[[Joey]]