From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 8 Sep 2008 15:42:31 +0000 (-0400)
Subject: Fix bad patch backport that broke generation of rss/atom feeds. Closes: #498224
X-Git-Tag: 2.53.2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc3b08be94d86a7aaf8e7823b30e225037e196d5;p=ikiwiki.git

Fix bad patch backport that broke generation of rss/atom feeds. Closes: #498224
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ea44081aa..d2f7dcc06 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -564,7 +564,7 @@ sub urlto ($$;$) { #{{{
 	}
 
 	if ($absolute) {
-		return $config{url}.beautify_urlpath("/".$to);
+		return $config{url}.beautify_url("/".$to);
 	}
 
 	my $link = abs2rel($to, dirname(htmlpage($from)));
diff --git a/debian/changelog b/debian/changelog
index 78c00483e..ede976151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.53.2) testing-proposed-updates; urgency=low
+
+  * Fix bad patch backport that broke generation of rss/atom feeds. Closes: #498224
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 08 Sep 2008 11:40:27 -0400
+
 ikiwiki (2.53.1) testing-proposed-updates; urgency=low
 
   * Backported all relevant bug fixes from mainline to debian testing.