diff options
author | Eric Helgeson <erichelgeson@gmail.com> | 2009-07-22 10:28:17 -0500 |
---|---|---|
committer | Eric Helgeson <erichelgeson@gmail.com> | 2009-07-22 10:28:17 -0500 |
commit | 829396106495a7b8090c31c383c0119912396cac (patch) | |
tree | 409fce658a5704024cb3d64121392485b2033799 /classes/File.php | |
parent | db19d61e68fcf8398579c2c4968e73db7f7ed93b (diff) | |
parent | abae9379478f2b87915930be81cd7be97f12ed8f (diff) |
Merge commit 'origin/0.8.x' into 0.9.x
Diffstat (limited to 'classes/File.php')
-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 68d385d1e..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 .= ' 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; |