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

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.)
master
Joey Hess 2009-03-19 16:01:23 -04:00
parent 86956b3392
commit a1c8520ce8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/inline.pm
View File

@ -281,8 +281,8 @@ sub preprocess_inline (@) {
} }
} }
my $rssurl=basename($feedbase."rss".$feednum) if $feeds && $rss; my $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $rss;
my $atomurl=basename($feedbase."atom".$feednum) if $feeds && $atom; my $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $atom;
my $ret=""; my $ret="";

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low
* inline: Add title_natural sort order, using Sort::Naturally * inline: Add title_natural sort order, using Sort::Naturally
(chrysn) (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 -- Joey Hess <joeyh@debian.org> Thu, 19 Mar 2009 15:32:49 -0400

2
doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
View File

@ -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). 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]]` `\[[!inline pages="link(tags/graphics) and ./posts/* and !*/Discussion" show="10" feedfile=graphics feedonly=yes]]`
[[done]] --[[Joey]]