you'd get this error on any refresh?

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 0224c2aac34d442c47b04e80d13a06db083fa8e2..61af830f859bcd4407cb845472a72d44eeed5c67 100644 (file)
--- 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,
@@ -122,7 +116,8 @@ sub decode_cgi_utf8 ($) {
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {
-                       $cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
+                       $cgi->param($f, map { decode_utf8 $_ }
+                               @{$cgi->param_fetch($f)});
                }
        }
 }