summaryrefslogtreecommitdiff
path: root/modules/upload/upload.module
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-10-17 21:47:14 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-10-17 21:47:14 +0000
commita3f3cb346bebb09dd89f31705c43c0c7d5c690d1 (patch)
treeafdf7c9e25ac03eae91fa15fc0328bd57474cbab /modules/upload/upload.module
parent988d4f505a8896df226660f37286c7f0bbe01e01 (diff)
downloadbrdo-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/upload.module')
-rw-r--r--modules/upload/upload.module4
1 files changed, 2 insertions, 2 deletions
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.