Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.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 5e580cc46f78aada58c4a0695af5c98f65469451..b7efa6a37590969f5c1b065b2a4de6f2f5ff9f4d 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,5 +1,7 @@
 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.
 
+Thanks, that had been annoying me too. [[done]] --[[Joey]]
+
 Patch:
 
 <pre>
@@ -22,4 +24,14 @@ Index: IkiWiki/Plugin/inline.pm
 +               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>