? 619434.patch
? 619434b.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.199
diff -u -p -r1.199 file.inc
--- includes/file.inc	5 Nov 2009 03:37:08 -0000	1.199
+++ includes/file.inc	8 Nov 2009 14:56:41 -0000
@@ -1681,9 +1681,16 @@ function file_upload_max_size() {
   static $max_size = -1;
 
   if ($max_size < 0) {
+    // $max_size is only less than 0 if it hasn't been retrieved from
+    // php.ini, so retrieve it. 
+    $max_size = parse_size(ini_get('post_max_size'));
     $upload_max = parse_size(ini_get('upload_max_filesize'));
-    $post_max = parse_size(ini_get('post_max_size'));
-    $max_size = ($upload_max < $post_max) ? $upload_max : $post_max;
+    
+    if ($upload_max > 0 && $upload_max < $max_size) {
+      // upload_max_filesize < post_max_size, so upload_max_filesize
+      // overrides post_max_size.
+      $max_size = $upload_max;
+    }
   }
   return $max_size;
 }