add allowed attachments field to admin prefs

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 2c4590babcc7f0e4a81b19c5d10641dad22d9eba..07e92322f4cbf94b9af112890077bd093f94b89d 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -303,7 +303,7 @@ sub cgi_editpage ($$) { #{{{
        
        # 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=~/^\//) {
@@ -668,7 +668,7 @@ sub cgi (;$$) { #{{{
 
        eval q{use CGI};
        error($@) if $@;
-       $CGI::DISABLE_UPLOADS=1;
+       $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
 
        if (! $q) {
                binmode(STDIN);