From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 11 Jul 2008 14:33:41 +0000 (-0400)
Subject: rename beautify_url to stress it only works on the path component
X-Git-Tag: 2.54~139
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d73d4fed0313db5f7dd08498871c304888d8d5e8;p=ikiwiki.git

rename beautify_url to stress it only works on the path component
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6e03121c0..c1d9119e8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -533,7 +533,7 @@ sub displaytime ($;$) { #{{{
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
 } #}}}
 
-sub beautify_url ($) { #{{{
+sub beautify_urlpath ($) { #{{{
 	my $url=shift;
 
 	if ($config{usedirs}) {
@@ -554,7 +554,7 @@ sub urlto ($$) { #{{{
 	my $from=shift;
 
 	if (! length $to) {
-		return beautify_url(baseurl($from)."index.$config{htmlext}");
+		return beautify_urlpath(baseurl($from)."index.$config{htmlext}");
 	}
 
 	if (! $destsources{$to}) {
@@ -563,7 +563,7 @@ sub urlto ($$) { #{{{
 
 	my $link = abs2rel($to, dirname(htmlpage($from)));
 
-	return beautify_url($link);
+	return beautify_urlpath($link);
 } #}}}
 
 sub htmllink ($$$;@) { #{{{
@@ -610,7 +610,7 @@ sub htmllink ($$$;@) { #{{{
 	}
 	
 	$bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
-	$bestlink=beautify_url($bestlink);
+	$bestlink=beautify_urlpath($bestlink);
 	
 	if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index bc069fbf2..8383fb72a 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -80,7 +80,7 @@ sub cgi ($) { #{{{
 				"</p>");
 		}
 		else {
-			IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_url("/".htmlpage($link)));
+			IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
 		}
 
 		exit;