From f2c05c63f98d2cc4f30dc23ad59819e53e405116 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 19 Sep 2008 03:40:32 +0000
Subject: [PATCH] #197266 by ufku, lilou, Dave Reid, and c960657: Avoid
unnecessary query if there is no user limit on uploaded files.
---
includes/file.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/includes/file.inc b/includes/file.inc
index 7696163b0aee..7770b924497f 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -733,7 +733,7 @@ function file_validate_extensions($file, $extensions) {
* @param $file_limit
* An integer specifying the maximum file size in bytes. Zero indicates that
* no limit should be enforced.
- * @param $$user_limit
+ * @param $user_limit
* An integer specifying the maximum number of bytes the user is allowed.
* Zero indicates that no limit should be enforced.
* @return
@@ -751,8 +751,7 @@ function file_validate_size($file, $file_limit = 0, $user_limit = 0) {
$errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($file_limit)));
}
- $total_size = file_space_used($user->uid) + $file->filesize;
- if ($user_limit && $total_size > $user_limit) {
+ 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)));
}
}
--
GitLab