aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-07-16 04:35:00 +0200
committerSven Fuchs <svenfuchs@artweb-design.de>2008-07-16 04:35:00 +0200
commit2e74ddbd73cb4212afbad3907f0130c6ec38572f (patch)
tree2a639c31e850d2f4e3f39794c8341010de682f24 /activerecord/lib/active_record
parentfbe1823117c6170e26b328ce192a2fc0945af533 (diff)
downloadrails-2e74ddbd73cb4212afbad3907f0130c6ec38572f.tar.gz
rails-2e74ddbd73cb4212afbad3907f0130c6ec38572f.tar.bz2
rails-2e74ddbd73cb4212afbad3907f0130c6ec38572f.zip
missed to remove a call to to_s while resolving conflicts in validations.rb
Diffstat (limited to 'activerecord/lib/active_record')
-rwxr-xr-xactiverecord/lib/active_record/validations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 38b2f38a3d..25eecaf49f 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -877,7 +877,7 @@ module ActiveRecord
raw_value = raw_value.to_i
else
begin
- raw_value = Kernel.Float(raw_value.to_s)
+ raw_value = Kernel.Float(raw_value)
rescue ArgumentError, TypeError
message = record.errors.generate_message(attr_name, :not_a_number, :value => raw_value, :default => configuration[:message])
record.errors.add(attr_name, message)