From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 1 Jul 2008 01:13:41 +0000 (-0400)
Subject: disable cgi uploads earlier
X-Git-Tag: 2.52~14^2~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbab5e9b85b04c5ae5b8687b954ff0ae96f1c3f4;p=ikiwiki.git

disable cgi uploads earlier

This allows plugins that want to enable uploads to do so by changing the
value of $CGI::DISABLE_UPLOADS at some point before the cgi hook is run.
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 2c4590bab..0d010b115 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -6,6 +6,8 @@ use IkiWiki;
 use IkiWiki::UserInfo;
 use open qw{:utf8 :std};
 use Encode;
+use CGI;
+$CGI::DISABLE_UPLOADS=1;
 
 package IkiWiki;
 
@@ -666,10 +668,6 @@ sub cgi (;$$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
-	eval q{use CGI};
-	error($@) if $@;
-	$CGI::DISABLE_UPLOADS=1;
-
 	if (! $q) {
 		binmode(STDIN);
 		$q=CGI->new;