Index: modules/upload/upload.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/Attic/upload.admin.inc,v
retrieving revision 1.7
diff -u -p -r1.7 upload.admin.inc
--- modules/upload/upload.admin.inc	10 Jan 2008 20:22:57 -0000	1.7
+++ modules/upload/upload.admin.inc	11 Jan 2010 12:25:02 -0000
@@ -17,17 +17,17 @@ function upload_admin_settings_validate(
   $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) .'<br/>';
   $more_info = t("Depending on your server environment, these settings may be changed in the system-wide php.ini file, a php.ini file in your Drupal root directory, in your Drupal site's settings.php file, or in the .htaccess file in your Drupal root directory.");
 
-  if (!is_numeric($default_uploadsize) || ($default_uploadsize <= 0)) {
-    form_set_error('upload_uploadsize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default'))));
+  if (!is_numeric($default_uploadsize) || ($default_uploadsize < 0)) {
+    form_set_error('upload_uploadsize_default', t('The %role file size limit must be a number and zero or greater than zero.', array('%role' => t('default'))));
   }
-  if (!is_numeric($default_usersize) || ($default_usersize <= 0)) {
-    form_set_error('upload_usersize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default'))));
+  if (!is_numeric($default_usersize) || ($default_usersize < 0)) {
+    form_set_error('upload_usersize_default', t('The %role file size limit must be a number and zero or greater than zero.', array('%role' => t('default'))));
   }
   if ($default_uploadsize * 1024 * 1024 > file_upload_max_size()) {
     form_set_error('upload_uploadsize_default', $exceed_max_msg . $more_info);
     $more_info = '';
   }
-  if ($default_uploadsize > $default_usersize) {
+  if ($default_usersize && $default_uploadsize > $default_usersize) {
     form_set_error('upload_uploadsize_default', t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => t('default'))));
   }
 
@@ -35,17 +35,17 @@ function upload_admin_settings_validate(
     $uploadsize = $form_state['values']['upload_uploadsize_'. $rid];
     $usersize = $form_state['values']['upload_usersize_'. $rid];
 
-    if (!is_numeric($uploadsize) || ($uploadsize <= 0)) {
-      form_set_error('upload_uploadsize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role)));
+    if (!is_numeric($uploadsize) || ($uploadsize < 0)) {
+      form_set_error('upload_uploadsize_'. $rid, t('The %role file size limit must be a number and zero or greater than zero.', array('%role' => $role)));
     }
-    if (!is_numeric($usersize) || ($usersize <= 0)) {
-      form_set_error('upload_usersize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role)));
+    if (!is_numeric($usersize) || ($usersize < 0)) {
+      form_set_error('upload_usersize_'. $rid, t('The %role file size limit must be a number and zero or greater than zero.', array('%role' => $role)));
     }
     if ($uploadsize * 1024 * 1024 > file_upload_max_size()) {
       form_set_error('upload_uploadsize_'. $rid, $exceed_max_msg . $more_info);
       $more_info = '';
     }
-    if ($uploadsize > $usersize) {
+    if ($usersize && $uploadsize > $usersize) {
       form_set_error('upload_uploadsize_'. $rid, t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => $role)));
     }
   }
@@ -103,7 +103,7 @@ function upload_admin_settings() {
     '#default_value' => $upload_usersize_default,
     '#size' => 5,
     '#maxlength' => 5,
-    '#description' => t('The default maximum size of all files a user can have on the site.'),
+    '#description' => t('The default maximum size of all files a user can have on the site. Set to 0 for no restriction.'),
     '#field_suffix' => t('MB'),
   );
 
@@ -141,7 +141,7 @@ function upload_admin_settings() {
       '#default_value' => variable_get('upload_usersize_'. $rid, $upload_usersize_default),
       '#size' => 5,
       '#maxlength' => 5,
-      '#description' => t('The maximum size of all files a user can have on the site.'),
+      '#description' => t('The maximum size of all files a user can have on the site. Set to 0 for no restriction.'),
       '#field_suffix' => t('MB'),
     );
   }