? filefield-6.x-3.x-extension_validation-1.patch
? filefield-file-formatter-presets.diff
Index: filefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield.module,v
retrieving revision 1.131
diff -u -p -r1.131 filefield.module
--- filefield.module	23 Jul 2008 14:44:39 -0000	1.131
+++ filefield.module	26 Jul 2008 18:45:46 -0000
@@ -537,23 +537,27 @@ function filefield_validate_extensions($
   global $user;
   $errors = array();
 
-  $regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';
-  if (!preg_match($regex, $file->filename)) {
-    $errors[] = t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => $extensions));
+  if (!empty($extensions)) {
+    $regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';
+    if (!preg_match($regex, $file->filename)) {
+      $errors[] = t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => $extensions));
+    }
   }
+
   return $errors;
 }
 
-
-
 // These two functions return messages for file_validate_size, and file_validate_extensions.
 // They're a neat hack that gets the job done.
 function filefield_validate_extensions_help($extensions) {
-  return t('Allowed Extensions: %ext', array('%ext' => $extensions));
+  if (!empty($extensions)) {
+    return t('Allowed Extensions: %ext', array('%ext' => $extensions));
+  }
+  else {
+    return '';
+  }
 }
 
 function file_validate_size_help($size) {
   return t('Maximum Filesize: %size', array('%size' => format_size($size)));
 }
-
-