aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/persistence.rb
diff options
context:
space:
mode:
authorJeremy Friesen <jeremy.n.friesen@gmail.com>2012-04-29 13:33:54 -0400
committerJeremy Friesen <jeremy.n.friesen@gmail.com>2012-04-29 13:33:54 -0400
commitc809c47837bf65a7a6e6f0e756e10bcafd2d9821 (patch)
tree157a82e5eaad93df4add4f95091e52dd9e54e10a /activerecord/lib/active_record/persistence.rb
parentd3ccdf6505a9cb11d391698ebbdc523e0fffe824 (diff)
downloadrails-c809c47837bf65a7a6e6f0e756e10bcafd2d9821.tar.gz
rails-c809c47837bf65a7a6e6f0e756e10bcafd2d9821.tar.bz2
rails-c809c47837bf65a7a6e6f0e756e10bcafd2d9821.zip
Removed extraneous .present? check for AR::Base#reload
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r--activerecord/lib/active_record/persistence.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index d6ffa1a9f7..4a987c2343 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -269,7 +269,7 @@ module ActiveRecord
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) }