Skip to content
Browse files

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

…tion
  • Loading branch information...
1 parent bd1059f commit c72140198d565e6a372530ccab8a1bc91c04ffff @spastorino spastorino committed Sep 7, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/base.rb
View
2 activerecord/lib/active_record/base.rb
@@ -943,7 +943,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 c721401

Please sign in to comment.
Something went wrong with that request. Please try again.