diff options
| -rw-r--r-- | modules/upload/upload.module | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 44596c186..adc651be2 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -158,7 +158,7 @@ function upload_admin_settings_validate($form_id, $form_values) { * Menu callback for the upload settings form. */ function upload_admin_settings() { - $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps'); + $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'); $upload_uploadsize_default = variable_get('upload_uploadsize_default', 1); $upload_usersize_default = variable_get('upload_usersize_default', 1); @@ -423,7 +423,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", variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps')); + $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')); $uploadsize = variable_get("upload_uploadsize_$rid", variable_get('upload_uploadsize_default', 1)) * 1024 * 1024; $usersize = variable_get("upload_usersize_$rid", variable_get('upload_usersize_default', 1)) * 1024 * 1024; @@ -641,7 +641,7 @@ function upload_munge_filename($filename, $extensions = NULL, $alerts = 1) { 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')); + $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')); } } |