Merge pull request #3425 from gschlager/patch-1

FIX: error message used wrong filesize
2015-05-03 21:57:05 +02:00 · 2015-05-03 21:57:05 +02:00 · 0a062112d9
parent 44bf8fc7f7 9a76ee8f8a
commit 0a062112d9
1 changed files with 3 additions and 2 deletions
--- a/lib/validators/upload_validator.rb
+++ b/lib/validators/upload_validator.rb
@ -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