diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-05-25 00:07:38 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-25 00:08:14 +0100 |
| commit | c69111ba5fde8445237f682c88b927bcde1588d4 (patch) | |
| tree | 4f29767a8b0c45352b2383f5bce497d582d8e98a /activerecord/lib/active_record/relation.rb | |
| parent | d21fef324b5270e9e3c255d278974a15a34b118a (diff) | |
| download | rails-c69111ba5fde8445237f682c88b927bcde1588d4.tar.gz rails-c69111ba5fde8445237f682c88b927bcde1588d4.tar.bz2 rails-c69111ba5fde8445237f682c88b927bcde1588d4.zip | |
Fix infinite recursion where a lazy default scope references a scope. Fixes #1264.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index a3f4a6fe94..65e2ad0963 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -424,7 +424,7 @@ module ActiveRecord end def with_default_scope #:nodoc: - if default_scoped? && default_scope = @klass.send(:build_default_scope) + if default_scoped? && default_scope = klass.send(:build_default_scope) default_scope = default_scope.merge(self) default_scope.default_scoped = false default_scope |