diff options
author | Brenda Wallace <shiny@cpan.org> | 2009-07-22 17:05:44 +1200 |
---|---|---|
committer | Brenda Wallace <shiny@cpan.org> | 2009-07-22 17:10:41 +1200 |
commit | 28b62f357d80d86e17f9688d65809cb959f4be6c (patch) | |
tree | 3a5cec99f75688de2b17004565dc51e4221c8b56 | |
parent | 36754f8323fbd200a97ccdc31e2c148104c7ba66 (diff) |
fixed SQL in checking for monthly quota - works in postgres and mysql
-rw-r--r-- | classes/File.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/File.php b/classes/File.php index 7ee8f6e08..0c4fbf7e6 100644 --- a/classes/File.php +++ b/classes/File.php @@ -122,6 +122,7 @@ class File extends Memcached_DataObject } function isRespectsQuota($user,$fileSize) { + if ($fileSize > common_config('attachments', 'file_quota')) { return sprintf(_('No file may be larger than %d bytes ' . 'and the file you sent was %d bytes. Try to upload a smaller version.'), @@ -135,8 +136,7 @@ class File extends Memcached_DataObject if ($total > common_config('attachments', 'user_quota')) { return sprintf(_('A file this large would exceed your user quota of %d bytes.'), common_config('attachments', 'user_quota')); } - - $query .= ' AND month(modified) = month(now()) and year(modified) = year(now())'; + $query .= ' AND EXTRACT(month FROM file.modified) = EXTRACT(month FROM now()) and EXTRACT(year FROM file.modified) = EXTRACT(year FROM now())'; $this->query($query); $this->fetch(); $total = $this->total + $fileSize; |