Permalink
Browse files

unscoped has nothing so merging with a relation just returns the rela…

…tion
  • Loading branch information...
1 parent b541a96 commit e8c7f1af0fe7b408688a3b260d2ba2b7ef03dd28 @spastorino spastorino committed Sep 7, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/base.rb
@@ -923,7 +923,7 @@ def find_sti_class(type_name)
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

0 comments on commit e8c7f1a

Please sign in to comment.