diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-10-17 21:47:14 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-10-17 21:47:14 +0000 |
| commit | a3f3cb346bebb09dd89f31705c43c0c7d5c690d1 (patch) | |
| tree | afdf7c9e25ac03eae91fa15fc0328bd57474cbab /modules/upload | |
| parent | 988d4f505a8896df226660f37286c7f0bbe01e01 (diff) | |
| download | brdo-a3f3cb346bebb09dd89f31705c43c0c7d5c690d1.tar.gz brdo-a3f3cb346bebb09dd89f31705c43c0c7d5c690d1.tar.bz2 | |
Drupal 6.0-beta 2 release with all Drupal 5.3 security fixes applied
Diffstat (limited to 'modules/upload')
| -rw-r--r-- | modules/upload/upload.admin.inc | 2 | ||||
| -rw-r--r-- | modules/upload/upload.module | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc index 0e922b15a..20472d4a6 100644 --- a/modules/upload/upload.admin.inc +++ b/modules/upload/upload.admin.inc @@ -55,7 +55,7 @@ function upload_admin_settings_validate($form, &$form_state) { * 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 odt ods odp'); + $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt 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); diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 2fe77aca6..d4e02a751 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -120,9 +120,9 @@ function upload_menu_alter(&$items) { function _upload_file_limits($user) { $file_limit = variable_get('upload_uploadsize_default', 1); $user_limit = variable_get('upload_usersize_default', 1); - $all_extensions = explode(' ', variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp')); + $all_extensions = explode(' ', variable_get('upload_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp')); 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 pdf ppt pps odt ods odp')); $all_extensions = array_merge($all_extensions, explode(' ', $extensions)); // A zero value indicates no limit, take the least restrictive limit. |