summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/CGI.pm6
-rw-r--r--IkiWiki/Plugin/attachment.pm9
2 files changed, 10 insertions, 5 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;
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index d2989bb8b..106660012 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -4,18 +4,21 @@ package IkiWiki::Plugin::attachment;
use warnings;
use strict;
use IkiWiki 2.00;
-use CGI;
-$CGI::DISABLE_UPLOADS=0;
# TODO move to admin prefs
$config{valid_attachments}="(*.mp3 and maxsize(15mb)) or (!ispage() and maxsize(50kb))";
sub import { #{{{
+ hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
} # }}}
-sub formbuilder_setup { #{{{
+sub checkconfig () { #{{{
+ $config{cgi_disable_uploads}=0;
+} #}}}
+
+sub formbuilder_setup (@) { #{{{
my %params=@_;
my $form=$params{form};