Commit 1b099cda by Jon Yurek

Removed the eval() call when parsing messages for validations.

parent 69525425
...@@ -144,7 +144,7 @@ module Paperclip ...@@ -144,7 +144,7 @@ module Paperclip
# * +in+: a Range of bytes (i.e. +1..1.megabyte+), # * +in+: a Range of bytes (i.e. +1..1.megabyte+),
# * +less_than+: equivalent to :in => 0..options[:less_than] # * +less_than+: equivalent to :in => 0..options[:less_than]
# * +greater_than+: equivalent to :in => options[:greater_than]..Infinity # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
# * +message+: error message to display, use #{min} and #{max} as replacements # * +message+: error message to display, use :min and :max as replacements
def validates_attachment_size name, options = {} def validates_attachment_size name, options = {}
attachment_definitions[name][:validations] << lambda do |attachment, instance| attachment_definitions[name][:validations] << lambda do |attachment, instance|
unless options[:greater_than].nil? unless options[:greater_than].nil?
...@@ -158,7 +158,7 @@ module Paperclip ...@@ -158,7 +158,7 @@ module Paperclip
max = options[:in].last max = options[:in].last
if options[:message] if options[:message]
eval('"' + options[:message] + '"') options[:message].gsub(/:min/, min.to_s).gsub(/:max/, max.to_s)
else else
"file size is not between #{min} and #{max} bytes." "file size is not between #{min} and #{max} bytes."
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment