From 9b145798c75e88267f4782b3cedc9d5deb41a0c8 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 14 Apr 2007 20:46:41 +0000
Subject: * Patch from Tuomov to link to the directory in feeds when usedirs is
 in   effect. Note that this changes permalinks, so if you are already using  
 usedirs you'll have to deal with that on upgrade to this version.

---
 IkiWiki/Plugin/inline.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 9cf781a25..452fdd267 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -320,14 +320,13 @@ sub genfeed ($$$$@) { #{{{
 	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);
 
 		$itemtemplate->param(
@@ -415,7 +414,7 @@ sub pingurl (@) { #{{{
 
 	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 {
-- 
cgit v1.2.3