inline: Fix display of all pages when archive=yes or show=0 are used.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8e7fa99580b4416adb78ebb3d676bfb80b5a78e2..f89209a1b70e07e6bdbc65f95abdb6e685e66dbb 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -212,7 +212,7 @@ sub preprocess_inline (@) {
                if ($params{feedshow} && $num < $params{feedshow}) {
                        $num=$params{feedshow};
                }
-               if ($params{skip}) {
+               if ($params{skip} && $num) {
                        $num+=$params{skip};
                }
 
@@ -221,7 +221,7 @@ sub preprocess_inline (@) {
                        filter => sub { $_[0] eq $params{page} },
                        sort => exists $params{sort} ? $params{sort} : "age",
                        reverse => yesno($params{reverse}),
-                       num => $num,
+                       ($num ? (num => $num) : ()),
                );
        }
 

diff --git a/debian/changelog b/debian/changelog
index b25651f42a700dc39cfd55e5b24de9e0691ce37b..c96919252bb4251eefeb8d373605e1949280e3d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
     the cgi/wiki.
   * inline: Do not generated feeds for nested inlines.
   * inline: Allow direct inclusion of non-page files in raw mode.
+  * inline: Fix display of all pages when archive=yes or show=0 are used.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 

diff --git a/doc/bugs/inline_skip_causes_empty_inline.mdwn b/doc/bugs/inline_skip_causes_empty_inline.mdwn
index 6ee1e601be7a22acc446ac169ae17cd29c6ff4ce..e1cbc5470385583eda682aaad3748a559f9d2b96 100644 (file)
--- a/doc/bugs/inline_skip_causes_empty_inline.mdwn
+++ b/doc/bugs/inline_skip_causes_empty_inline.mdwn
@@ -7,4 +7,4 @@ but not in 3.20091031.
 
 >> The bug occurs only together with archive="yes" as I Just found out:
 
-[[!inline pages="news/*" archive="yes" feeds="no" skip=3]]
+>>> Thanks, [[fixed|done]] in git. --[[Joey]]