diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-01 13:43:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-01 13:43:32 -0400 |
| commit | 7cd40ea4eb8955765dc3e61dd3edaf08d1bbab48 (patch) | |
| tree | ecae069299e4589457831784bda06abfe6ce8375 /IkiWiki/CGI.pm | |
| parent | 5aee8d937d694dc5ae43b85c6d81ce9d268d1626 (diff) | |
| download | ikiwiki-7cd40ea4eb8955765dc3e61dd3edaf08d1bbab48.tar ikiwiki-7cd40ea4eb8955765dc3e61dd3edaf08d1bbab48.tar.gz | |
better approach for cgi upload disabling
Make it a config setting, this way subtle load order issues don't come into
play. (As much?)
Diffstat (limited to 'IkiWiki/CGI.pm')
| -rw-r--r-- | IkiWiki/CGI.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 2805534fc..07e92322f 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -6,8 +6,6 @@ use IkiWiki; use IkiWiki::UserInfo; use open qw{:utf8 :std}; use Encode; -use CGI; -$CGI::DISABLE_UPLOADS=1; package IkiWiki; @@ -668,6 +666,10 @@ sub cgi (;$$) { #{{{ my $q=shift; my $session=shift; + eval q{use CGI}; + error($@) if $@; + $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads}; + if (! $q) { binmode(STDIN); $q=CGI->new; |