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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 93dc0149e7a092a479807095f876a758db11d902..17d1611db478237c01f2f99223bf0c960a4525e9 100644 (file)
--- 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 eb9bf496ffc5f54dca838ac79d268ff598d539bc..4ad346c13a4748ac8a84b4740a1f7e802e72167e 100644 (file)
--- 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 c0d7c76c60556f296608ce7c85c2e4c532afee04..998ba642b77c0f9e50304700aa0c267d1f6496ed 100644 (file)
--- 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]]