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

inline: Do not generated feeds for nested inlines. 

My experience is that when inlines are nested, the old behavior of
generating feeds for the nested inlines was never really desired. Since the
feeds were numbered sequentially, the numbers could easily change, and it did
not make sense to subscribe to or use those feeds. And generating those nested
feeds often meant a lot of unnecessary calculation, and data being written.
So, I dropped them.

Looking back, nested feeds originally were a free side effect of properly
handing multiple feeds on one page. Of course, that is still supported.
master
Joey Hess 2009-11-13 14:56:24 -05:00
parent b9f264d066
commit 5ccf68f113
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/inline.pm
View File

@ -159,7 +159,7 @@ sub preprocess_inline (@) {
my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss}; my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom}; my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
my $quick=exists $params{quick} ? yesno($params{quick}) : 0; my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick; my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick);
my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1; my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
my $feedonly=yesno($params{feedonly}); my $feedonly=yesno($params{feedonly});
if (! exists $params{show} && ! $archive) { if (! exists $params{show} && ! $archive) {

1
debian/changelog vendored
View File

@ -13,6 +13,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
* httpauth: Add cgiauthurl setting that can be used to do http basic auth * httpauth: Add cgiauthurl setting that can be used to do http basic auth
only when ikiwiki needs authentication, rather than for any access to only when ikiwiki needs authentication, rather than for any access to
the cgi/wiki. the cgi/wiki.
* inline: Do not generated feeds for nested inlines.
-- 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