X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cfbcbda0ad848334640ad849ed618873ecba8eb4..f1d77f81933b4e4c38780a1934ac6daaaf0a9b80:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f448db6ef..d801c72a0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -67,9 +67,6 @@ sub cgitemplate ($$$;@) {
 	if (exists $params{page}) {
 		$page=delete $params{page};
 		$params{forcebaseurl}=urlto($page);
-		if (! $config{html5}) {
-			$params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl);
-		}
 	}
 	run_hooks(pagetemplate => sub {
 		shift->(
@@ -81,9 +78,6 @@ sub cgitemplate ($$$;@) {
 	templateactions($template, "");
 
 	my $baseurl = baseurl();
-	if (! $config{html5}) {
-		$baseurl = urlabs($baseurl, $topurl),
-	}
 
 	$template->param(
 		dynamic => 1,
@@ -130,9 +124,7 @@ sub decode_cgi_utf8 ($) {
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;
-    # call decode_utf8 on >= 5.20 only if it's not already decoded,
-    # otherwise it balks, on < 5.20, always call it
-    if ($] < 5.02 || !Encode::is_utf8($octets)) {
+    if (!Encode::is_utf8($octets)) {
         return decode_utf8($octets);
     }
     else {