X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3b83e520182a83e4ae6c61ab7b360b0eb939469f..e3e6ca2777990caf96e524f59e22925841c79e6e:/IkiWiki/Plugin/404.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index 5550ea7d1..42cfa9e8a 100644
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "cgi", id => '404',  call => \&cgi);
+	hook(type => "getsetup", id => '404',  call => \&getsetup);
 	IkiWiki::loadplugin("goto");
 }
 
@@ -21,6 +22,7 @@ sub getsetup () {
 			# server admin action too
 			safe => 0,
 			rebuild => 0,
+			section => "web",
 		}
 }
 
@@ -67,8 +69,10 @@ sub cgi_page_from_404 ($$$) {
 sub cgi ($) {
 	my $cgi=shift;
 
-	if ($ENV{REDIRECT_STATUS} eq '404') {
-		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
+	if (exists $ENV{REDIRECT_STATUS} && 
+	    $ENV{REDIRECT_STATUS} eq '404') {
+		my $page = cgi_page_from_404(
+			Encode::decode_utf8($ENV{REDIRECT_URL}),
 			$config{url}, $config{usedirs});
 		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
 	}