summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-14 20:46:41 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-14 20:46:41 +0000
commit9b145798c75e88267f4782b3cedc9d5deb41a0c8 (patch)
treed77dddf5b61b9dfbe8b98c800a2cb6c7f4263692 /IkiWiki/Plugin
parent250bd850e2d41769075a201b098f2961179a8f8c (diff)
* 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.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/inline.pm7
1 files changed, 3 insertions, 4 deletions
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 {