IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 13:39:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3425 from gschlager/patch-1

Browse Source 
FIX: error message used wrong filesize
This commit is contained in:
Régis Hanol 2015-05-03 21:57:05 +02:00
commit 0a062112d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/validators/upload_validator.rb
View File

@ -78,9 +78,10 @@ class Validators::UploadValidator < ActiveModel::Validator
end
def maximum_file_size(upload, type)
max_size_kb = SiteSetting.send("max_#{type}_size_kb").kilobytes
max_size_kb = SiteSetting.send("max_#{type}_size_kb")
max_size_bytes = max_size_kb.kilobytes
if upload.filesize > max_size_kb
if upload.filesize > max_size_bytes
message = I18n.t("upload.#{type}s.too_large", max_size_kb: max_size_kb)
upload.errors.add(:filesize, message)
end