urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2009-11-13 20:50:27 -05:00
parent e062693632
commit d8cfd8d431
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/inline.pm
View File

@ -212,7 +212,7 @@ sub preprocess_inline (@) {
if ($params{feedshow} && $num < $params{feedshow}) { if ($params{feedshow} && $num < $params{feedshow}) {
$num=$params{feedshow}; $num=$params{feedshow};
} }
if ($params{skip}) { if ($params{skip} && $num) {
$num+=$params{skip}; $num+=$params{skip};
} }
@ -221,7 +221,7 @@ sub preprocess_inline (@) {
filter => sub { $_[0] eq $params{page} }, filter => sub { $_[0] eq $params{page} },
sort => exists $params{sort} ? $params{sort} : "age", sort => exists $params{sort} ? $params{sort} : "age",
reverse => yesno($params{reverse}), reverse => yesno($params{reverse}),
num => $num, ($num ? (num => $num) : ()),
); );
} }

1
debian/changelog vendored
View File

@ -15,6 +15,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
the cgi/wiki. the cgi/wiki.
* inline: Do not generated feeds for nested inlines. * inline: Do not generated feeds for nested inlines.
* inline: Allow direct inclusion of non-page files in raw mode. * 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 -- Joey Hess <joeyh@debian.org> Fri, 06 Nov 2009 12:04:29 -0500

2
doc/bugs/inline_skip_causes_empty_inline.mdwn
View File

@ -7,4 +7,4 @@ but not in 3.20091031.
>> The bug occurs only together with archive="yes" as I Just found out: >> 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]]