diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 22c210e..447871b 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -527,17 +527,17 @@ function file_validate_extensions(File $file, $extensions) { */ function file_validate_size(File $file, $file_limit = 0, $user_limit = 0) { global $user; - $errors = array(); if ($file_limit && $file->filesize > $file_limit) { - $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($file_limit))); + $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($file_limit))); } - // Save a query by only calling file_space_used() when a limit is provided. + // Save a query by only calling file_space_used() when a limit is provided. if ($user_limit && (file_space_used($user->uid) + $file->filesize) > $user_limit) { - $errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->filesize), '%quota' => format_size($user_limit))); + $errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->filesize), '%quota' => format_size($user_limit))); } + return $errors; }