diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-03-01 16:35:13 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-03-01 16:35:13 -0800 |
| commit | 3a156ec8e79b88ff90e8f5ed34dd05b89e94b72f (patch) | |
| tree | 51de06188cad040c76c51cd7db9ccb4e8a2a003c /activerecord | |
| parent | 4cfa10cda5e5088eabce10cef0623e2b2a9c40dd (diff) | |
| download | rails-3a156ec8e79b88ff90e8f5ed34dd05b89e94b72f.tar.gz rails-3a156ec8e79b88ff90e8f5ed34dd05b89e94b72f.tar.bz2 rails-3a156ec8e79b88ff90e8f5ed34dd05b89e94b72f.zip | |
remove useless conditional
`@reflects_state[depth+1]` will always be nil because we haven't made a
method call that would make it true yet.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index d41872d767..e1a72baff0 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -522,7 +522,7 @@ module ActiveRecord @reflects_state[depth] = true end - if transaction_state.parent && !@reflects_state[depth+1] + if transaction_state.parent update_attributes_from_transaction_state(transaction_state.parent, depth+1) end end |