summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-09-26 14:11:58 +0000
committerDries Buytaert <dries@buytaert.net>2006-09-26 14:11:58 +0000
commit24ac1a1fb28238d6796649e27cceab67b8257748 (patch)
tree6b0276c38f66f2c5aa1d1cb7a2acf2a1eb8cbacf
parent845ff1c17f9b03d0ff20194ef63b838da3622397 (diff)
downloadbrdo-24ac1a1fb28238d6796649e27cceab67b8257748.tar.gz
brdo-24ac1a1fb28238d6796649e27cceab67b8257748.tar.bz2
- Patch #85257 by RobRoy: fixed default upload restrictions.
-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 9595dc7df..fe8c7adfb 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -167,7 +167,7 @@ function upload_admin_settings_validate($form_id, $form_values) {
function upload_admin_settings() {
$upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps');
$upload_uploadsize_default = variable_get('upload_uploadsize_default', 1);
- $upload_usersize_default = variable_get('upload_usersize_default', 10);
+ $upload_usersize_default = variable_get('upload_usersize_default', 1);
$form['settings_general'] = array(
'#type' => 'fieldset',
@@ -418,7 +418,7 @@ function _upload_validate(&$node) {
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'));
$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', 10)) * 1024 * 1024;
+ $usersize = variable_get("upload_usersize_$rid", variable_get('upload_usersize_default', 1)) * 1024 * 1024;
$regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';