Permalink
Browse files

Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-…

…to-reload

Removed extraneous .present? check for AR::Base#reload
  • Loading branch information...
2 parents 82029c7 + c809c47 commit de6d94f9fb86f9566818a0b8af99f745b3d50fe5 @josevalim josevalim committed Apr 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/persistence.rb
@@ -269,7 +269,7 @@ def reload(options = nil)
clear_association_cache
fresh_object =
- if options.present? && options[:lock]
+ if options && options[:lock]
self.class.unscoped { self.class.lock.find(id) }
else
self.class.unscoped { self.class.find(id) }

0 comments on commit de6d94f

Please sign in to comment.