diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-07 03:32:11 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-07 03:33:06 -0300 |
| commit | e8c7f1af0fe7b408688a3b260d2ba2b7ef03dd28 (patch) | |
| tree | 0b4e003ca547cf090481c962ac59a28246da1dfa /activerecord | |
| parent | b541a963bd94e189219619553476321f4be37490 (diff) | |
| download | rails-e8c7f1af0fe7b408688a3b260d2ba2b7ef03dd28.tar.gz rails-e8c7f1af0fe7b408688a3b260d2ba2b7ef03dd28.tar.bz2 rails-e8c7f1af0fe7b408688a3b260d2ba2b7ef03dd28.zip | |
unscoped has nothing so merging with a relation just returns the relation
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 47394de3c1..24bfef0a20 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -923,7 +923,7 @@ module ActiveRecord #:nodoc: end def construct_finder_arel(options = {}, scope = nil) - relation = options.is_a?(Hash) ? unscoped.apply_finder_options(options) : unscoped.merge(options) + relation = options.is_a?(Hash) ? unscoped.apply_finder_options(options) : options relation = scope.merge(relation) if scope relation end |