From c91b39fdb52c935fbca20ca55a256278f4661a5b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 Jan 2011 16:18:25 -0400
Subject: factored out an urlabs from aggregate and cgi

---
 IkiWiki/CGI.pm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'IkiWiki/CGI.pm')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index e8850cc54..f1bec6b8f 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -59,26 +59,16 @@ sub showform_preview ($$$$;@) {
 	my %params=@_;
 
 	# The base url needs to be a full URL, and urlto may return a path.
-	my $baseurl = absurl(urlto($params{page}), $cgi);
+	my $baseurl = urlabs(urlto($params{page}), $cgi->url);
 
 	showform($form, $buttons, $session, $cgi, @_,
 		forcebaseurl => $baseurl);
 }
 
-# Forces a partial url (path only) to absolute, using the same
-# URL scheme as the CGI. Full URLs are left unchanged.
-sub absurl ($$) {
-	my $partialurl=shift;
-	my $q=shift;
-
-	eval q{use URI};
-	return URI->new_abs($partialurl, $q->url);
-}
-
 sub redirect ($$) {
 	my $q=shift;
 	eval q{use URI};
-	my $url=URI->new(absurl(shift, $q));
+	my $url=URI->new(urlabs(shift, $q->url));
 	if (! $config{w3mmode}) {
 		print $q->redirect($url);
 	}
-- 
cgit v1.2.3