web commit by tuomov: More patch

[ikiwiki.git] / doc / bugs / Feeds_link_to_index.html_instead_of_directory.mdwn

diff --git a/doc/bugs/Feeds_link_to_index.html_instead_of_directory.mdwn b/doc/bugs/Feeds_link_to_index.html_instead_of_directory.mdwn
index 2c934ff2de5abf734e28ec183b119f66dad6dee0..1ae3d5e6fb11a5cb827245b0f905541302b78b77 100644 (file)
--- a/doc/bugs/Feeds_link_to_index.html_instead_of_directory.mdwn
+++ b/doc/bugs/Feeds_link_to_index.html_instead_of_directory.mdwn
@@ -1 +1,35 @@
 When --usedirs is used, RSS and Atom feeds seem to link to the index.html directly, both for the site and for the feed items, instead of the directory, as pages otherwise do.
+
+Patch:
+
+<pre>
+Index: IkiWiki/Plugin/inline.pm
+===================================================================
+--- IkiWiki/Plugin/inline.pm    (revision 3241)
++++ IkiWiki/Plugin/inline.pm    (working copy)
+@@ -312,13 +312,13 @@
+        my $page=shift;
+        my @pages=@_;
+ 
+-       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
++       my $url=URI->new(encode_utf8($config{url}."/".urlto($page, "")));
+ 
+        my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
+        my $content="";
+        my $lasttime = 0;
+        foreach my $p (@pages) {
+-               my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));
++               my $u=URI->new(encode_utf8($config{url}."/".urlto($p, "")));
+ 
+                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
+
+@@ -415,7 +415,7 @@
+ 
+        foreach my $page (keys %toping) {
+                my $title=pagetitle(basename($page), 0);
+-               my $url="$config{url}/".htmlpage($page);
++               my $url="$config{url}/".urlto($page, "");
+                foreach my $pingurl (@{$config{pingurl}}) {
+                        debug("Pinging $pingurl for $page");
+                        eval {
+</pre>