Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / 404.pm

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index bae9e15d1a67ea8705626d69dc69cdc486e68306..8adfd5dd99668c526168b09ba4f0fc334873d578 100644 (file)
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -21,6 +21,7 @@ sub getsetup () {
                        # server admin action too
                        safe => 0,
                        rebuild => 0,
                        # server admin action too
                        safe => 0,
                        rebuild => 0,

+                       section => "web",

                }
 }
 
                }
 }
 


@@ -69,7 +70,8 @@ sub cgi ($) {
 
        if (exists $ENV{REDIRECT_STATUS} && 
            $ENV{REDIRECT_STATUS} eq '404') {
 
        if (exists $ENV{REDIRECT_STATUS} && 
            $ENV{REDIRECT_STATUS} eq '404') {

-               my $page = cgi_page_from_404($ENV{REDIRECT_URL},
+               my $page = cgi_page_from_404(
+                       Encode::decode_utf8($ENV{REDIRECT_URL}),

                        $config{url}, $config{usedirs});
                IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
        }
                        $config{url}, $config{usedirs});
                IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
        }