summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-03-19 16:01:23 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-03-19 16:01:30 -0400
commita1c8520ce8798dcd2d6b16a59da93afbd4bbf86b (patch)
tree169bfb004beddee8e61c4689192bf7aabce186f5
parent86956b3392f7e768fa8f527a0b3a4b7d1a080aef (diff)
inline: Fix urls to feed when feedfile is used on an index page.
It would be better to use urlto() here, but will_render has not yet been called on the feed files at this point, so it won't work. (And reorganizing so it can be is tricky.)
-rw-r--r--IkiWiki/Plugin/inline.pm4
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn2
3 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 218fd7515..9d7d4b0fd 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -281,8 +281,8 @@ sub preprocess_inline (@) {
}
}
- my $rssurl=basename($feedbase."rss".$feednum) if $feeds && $rss;
- my $atomurl=basename($feedbase."atom".$feednum) if $feeds && $atom;
+ my $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $rss;
+ my $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $atom;
my $ret="";
diff --git a/debian/changelog b/debian/changelog
index 8266afa09..06707a83c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low
* inline: Add title_natural sort order, using Sort::Naturally
(chrysn)
+ * inline: Fix urls to feed when feedfile is used on an index page.
-- Joey Hess <joeyh@debian.org> Thu, 19 Mar 2009 15:32:49 -0400
diff --git a/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn b/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
index 1653e0b02..6b8781a8c 100644
--- a/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
+++ b/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
@@ -3,3 +3,5 @@
When I put the following !inline in my index.mdwn, it generate a file called index/graphics.rss. However, the link in the RSS button is to graphics.rss (i.e., not in the index/ directory).
`\[[!inline pages="link(tags/graphics) and ./posts/* and !*/Discussion" show="10" feedfile=graphics feedonly=yes]]`
+
+[[done]] --[[Joey]]