Index: modules/upload.module =================================================================== RCS file: /cvs/drupal/drupal/modules/Attic/upload.module,v retrieving revision 1.100.2.13 diff -u -p -r1.100.2.13 upload.module --- modules/upload.module 8 Mar 2007 08:22:07 -0000 1.100.2.13 +++ modules/upload.module 9 Sep 2007 22:17:09 -0000 @@ -157,7 +157,7 @@ function upload_settings() { foreach ($roles as $rid => $role) { $form["settings_role_$rid"] = array('#type' => 'fieldset', '#title' => t('Settings for %role', array('%role' => theme('placeholder', $role))), '#collapsible' => TRUE, '#collapsed' => TRUE); $form["settings_role_$rid"]["upload_extensions_$rid"] = array( - '#type' => 'textfield', '#title' => t('Permitted file extensions'), '#default_value' => variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'), + '#type' => 'textfield', '#title' => t('Permitted file extensions'), '#default_value' => variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt doc xls xls pdf ppt pps odt ods odp'), '#maxlength' => 255, '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.') ); $form["settings_role_$rid"]["upload_uploadsize_$rid"] = array( @@ -326,7 +326,7 @@ function _upload_validate(&$node) { $total_usersize = upload_space_used($user->uid) + $filesize; $error = array(); foreach ($user->roles as $rid => $name) { - $extensions = variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'); + $extensions = variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt doc xls xls pdf ppt pps odt ods odp'); $uploadsize = variable_get("upload_uploadsize_$rid", 1) * 1024 * 1024; $usersize = variable_get("upload_usersize_$rid", 10) * 1024 * 1024; @@ -538,7 +538,7 @@ function upload_munge_filename($filename if (!isset($extensions)) { $extensions = ''; foreach ($user->roles as $rid => $name) { - $extensions .= ' '. variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp')); + $extensions .= ' '. variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt doc xls xls pdf ppt pps odt ods odp')); } }