Merge branch 'tova'

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 0d010b1150d3e5c5ee94028821c05d0558ee5f73..07e92322f4cbf94b9af112890077bd093f94b89d 100644 (file)
--- 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 IkiWiki::UserInfo;
 use open qw{:utf8 :std};
 use Encode;

-use CGI;
-$CGI::DISABLE_UPLOADS=1;

 
 package IkiWiki;
 
 
 package IkiWiki;
 


@@ -305,7 +303,7 @@ sub cgi_editpage ($$) { #{{{
        
        # This untaint is safe because titlepage removes any problematic
        # characters.
        
        # This untaint is safe because titlepage removes any problematic
        # characters.

-       my ($page)=$form->field('page');
+       my $page=$form->field('page');

        $page=titlepage(possibly_foolish_untaint($page));
        if (! defined $page || ! length $page ||
            file_pruned($page, $config{srcdir}) || $page=~/^\//) {
        $page=titlepage(possibly_foolish_untaint($page));
        if (! defined $page || ! length $page ||
            file_pruned($page, $config{srcdir}) || $page=~/^\//) {


@@ -668,6 +666,10 @@ sub cgi (;$$) { #{{{
        my $q=shift;
        my $session=shift;
 
        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;
        if (! $q) {
                binmode(STDIN);
                $q=CGI->new;