diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-07-29 16:46:16 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-07-29 16:54:54 -0700 |
commit | d83b1828577c268de56e1b3942e16002c9efdd57 (patch) | |
tree | 7d3038fd5b21e63ce03418d23a52c609cd5def2f /activerecord/lib | |
parent | e566fc0577f336be35145b815f3fd0a554eab564 (diff) | |
download | rails-d83b1828577c268de56e1b3942e16002c9efdd57.tar.gz rails-d83b1828577c268de56e1b3942e16002c9efdd57.tar.bz2 rails-d83b1828577c268de56e1b3942e16002c9efdd57.zip |
Revert "Methods invoked within named scope Procs should respect the scope stack. [#1267 state:resolved]"
This reverts commit 6a13376525f34a00e013fc3a6022838329dfe856.
Conflicts:
activerecord/test/cases/named_scope_test.rb
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/named_scope.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb index dd2a90b8e5..bbe2d1f205 100644 --- a/activerecord/lib/active_record/named_scope.rb +++ b/activerecord/lib/active_record/named_scope.rb @@ -92,12 +92,7 @@ module ActiveRecord when Hash options when Proc - case parent_scope - when Scope - with_scope(:find => parent_scope.proxy_options) { options.call(*args) } - else - options.call(*args) - end + options.call(*args) end, &block) end metaclass.instance_eval do |