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

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

master
Joey Hess 2010-01-01 15:09:15 -05:00
parent ddda9800d6
commit 63cc5384bb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/inline.pm
View File

@ -209,7 +209,7 @@ sub preprocess_inline (@) {
if ($params{show}) { if ($params{show}) {
$num=$params{show}; $num=$params{show};
} }
if ($params{feedshow} && $num < $params{feedshow}) { if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {
$num=$params{feedshow}; $num=$params{feedshow};
} }
if ($params{skip} && $num) { if ($params{skip} && $num) {

2
debian/changelog vendored
View File

@ -12,6 +12,8 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
avoid merge conflicts when comments are posted to two branches of a avoid merge conflicts when comments are posted to two branches of a
site. site.
* linkmap: Add option to omit disconnected pages from the map. * 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 -- Joey Hess <joeyh@debian.org> Fri, 25 Dec 2009 14:31:22 -0500

6
doc/ikiwiki/directive/inline/discussion.mdwn
View File

@ -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 Reading the documentation I would think that `feedshow` does not
influence `show`. influence `show`.
[[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]] \[[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
> Somehow the line above is not displayed correctly.
Only ten pages are listed in this example although `archive` is set to Only ten pages are listed in this example although `archive` is set to
yes. Removing `feedshow=10` all matching pages are shown. 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]] > Is something going wrong because `quick="yes"` [[»turns off generation of any feeds«|inline]]? --[[PaulePanter]]
--[[PaulePanter]] --[[PaulePanter]]
>> Bug was that if feedshow was specified without show it limited to it incorrectly. Fixed. --[[Joey]]