From 5ccf68f11329779f9e173355fe76bff85203a851 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Nov 2009 14:56:24 -0500 Subject: [PATCH] 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. --- IkiWiki/Plugin/inline.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 942df6f89..001d2ed1a 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -159,7 +159,7 @@ sub preprocess_inline (@) { 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 $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 $feedonly=yesno($params{feedonly}); if (! exists $params{show} && ! $archive) { diff --git a/debian/changelog b/debian/changelog index 1a703b11f..5a2d94e23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low * httpauth: Add cgiauthurl setting that can be used to do http basic auth only when ikiwiki needs authentication, rather than for any access to the cgi/wiki. + * inline: Do not generated feeds for nested inlines. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 -- 2.44.0