diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-29 10:40:52 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-29 10:40:52 -0700 |
| commit | de6d94f9fb86f9566818a0b8af99f745b3d50fe5 (patch) | |
| tree | 5908a8e130854769757db08fa7e90b04b71da76a | |
| parent | 82029c7511939074c7f50a415016fb2910c5d95e (diff) | |
| parent | c809c47837bf65a7a6e6f0e756e10bcafd2d9821 (diff) | |
| download | rails-de6d94f9fb86f9566818a0b8af99f745b3d50fe5.tar.gz rails-de6d94f9fb86f9566818a0b8af99f745b3d50fe5.tar.bz2 rails-de6d94f9fb86f9566818a0b8af99f745b3d50fe5.zip | |
Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-to-reload
Removed extraneous .present? check for AR::Base#reload
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 2 |
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) } |