Item9418: Uploading files causes fatal error

CGI::Charset must be called after the CGI object has been created
Otherwise we loose things like the tmp file during uploads
Thanks to Crawford for helping where to move the call.
That was a looong night to find the root cause of this one ;-)


git-svn-id: http://svn.foswiki.org/trunk@8388 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

core/lib/Foswiki.pm

@@ -380,16 +380,6 @@ BEGIN {
         setlocale( &LC_COLLATE, $Foswiki::cfg{Site}{Locale} );
     }
 
-    if ( defined $Foswiki::cfg{Site}{CharSet} ) {
-
-        # Ensure the auto-encoding in CGI uses the correct character set.
-        # CGI defaults to iso-8859-1, and has a special exception for
-        # iso-8859-1 and windows1252 in CGI::escapeHTML which breaks
-        # UTF-8 content. See Item758. Get this wrong, and CGI will
-        # fail to encode certain UTF-8 characters correctly.
-        CGI::charset( $Foswiki::cfg{Site}{CharSet} );
-    }
-
     $macros{CHARSET} = sub {
         $Foswiki::cfg{Site}{CharSet} || CGI::charset();
     };
@@ -1623,6 +1613,16 @@ sub new {
 
     $query ||= new Foswiki::Request();
     my $this = bless( { sandbox => 'Foswiki::Sandbox' }, $class );
+
+    if ( defined $Foswiki::cfg{Site}{CharSet} ) {
+
+        # Ensure the auto-encoding in CGI uses the correct character set.
+        # CGI defaults to iso-8859-1, and has a special exception for
+        # iso-8859-1 and windows1252 in CGI::escapeHTML which breaks
+        # UTF-8 content. See Item758. Get this wrong, and CGI will
+        # fail to encode certain UTF-8 characters correctly.
+        CGI::charset( $Foswiki::cfg{Site}{CharSet} );
+    }
 
     $this->{request}  = $query;
     $this->{cgiQuery} = $query;    # for backwards compatibility in contribs