Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.79
diff -u -F^f -r1.79 file.inc
--- includes/file.inc	5 Jul 2006 11:45:51 -0000	1.79
+++ includes/file.inc	2 Aug 2006 15:48:28 -0000
@@ -228,7 +228,7 @@ function file_check_upload($source = 'up
     $file->filemime = $_FILES["edit"]["type"][$source];
 
     // Rename potentially executable files, to help prevent exploits.
-    if (((substr($file->filemime, 0, 5) == 'text/' || strpos($file->filemime, 'javascript')) && (substr($file->filename, -4) != '.txt')) || preg_match('/\.(php|pl|py|cgi|asp)$/i', $file->filename)) {
+    if ((variable_get('file_rename_dangerous_uploads', 1)) && (((substr($file->filemime, 0, 5) == 'text/' || strpos($file->filemime, 'javascript')) && (substr($file->filename, -4) != '.txt')) || preg_match('/\.(php|pl|py|cgi|asp)$/i', $file->filename))) {
       $file->filemime = 'text/plain';
       $file->filepath .= '.txt';
       $file->filename .= '.txt';