Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.260
diff -u -p -r1.260 upload.module
--- modules/upload/upload.module	25 Sep 2009 14:24:34 -0000	1.260
+++ modules/upload/upload.module	28 Sep 2009 23:29:43 -0000
@@ -563,11 +563,13 @@ function _upload_form($node) {
 
     $limit_description = t('The maximum size of file uploads is %filesize.', array('%filesize' => format_size($limits['file_size']))) . ' ';
     if (!empty($limits['resolution'])) {
-      if (image_get_toolkit()) {
-        $limit_description .= t('Images larger than %resolution will be resized.', array('%resolution' => $limits['resolution'])) . ' ';
-      }
-      else {
-        $limit_description .= t('Images may not be larger than %resolution.', array('%resolution' => $limits['resolution'])) . ' ';
+      if ($limits['resolution'] != '0x0') {
+        if (image_get_toolkit()) {
+          $limit_description .= t('Images larger than %resolution will be resized.', array('%resolution' => $limits['resolution'])) . ' ';
+        }
+        else {
+          $limit_description .= t('Images may not be larger than %resolution.', array('%resolution' => $limits['resolution'])) . ' ';
+        }
       }
     }
     $limit_description .= t('Only files with the following extensions may be uploaded: %extensions.', array('%extensions' => $limits['extensions'])) . ' ';
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.191
diff -u -p -r1.191 file.inc
--- includes/file.inc	28 Sep 2009 22:22:53 -0000	1.191
+++ includes/file.inc	28 Sep 2009 23:29:43 -0000
@@ -1369,6 +1369,7 @@ function file_validate_image_resolution(
   // Check first that the file is an image.
   if ($info = image_get_info($file->uri)) {
     if ($maximum_dimensions) {
+    if ($maximum_dimensions != '0x0') {
       // Check that it is smaller than the given dimensions.
       list($width, $height) = explode('x', $maximum_dimensions);
       if ($info['width'] > $width || $info['height'] > $height) {
@@ -1384,6 +1385,7 @@ function file_validate_image_resolution(
         }
       }
     }
+  }
 
     if ($minimum_dimensions) {
       // Check that it is larger than the given dimensions.