diff options
| author | Jan <jan.h.xie@gmail.com> | 2010-10-12 12:42:09 +0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-20 09:00:36 -0700 |
| commit | 21beedf1ff925613fb1ca9b3cf44d10526b64a2e (patch) | |
| tree | c85d49124123f31f8da290b469a8aed51855cfd7 /activerecord/lib/active_record | |
| parent | dbc5d2694f0c77ca9de43306602969fdd3dbd20e (diff) | |
| download | rails-21beedf1ff925613fb1ca9b3cf44d10526b64a2e.tar.gz rails-21beedf1ff925613fb1ca9b3cf44d10526b64a2e.tar.bz2 rails-21beedf1ff925613fb1ca9b3cf44d10526b64a2e.zip | |
default scope merge where clauses [#5488 state:resolved]
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 6720f0687a..0e41a1c35c 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1139,6 +1139,7 @@ MSG # Article.new.published # => true # Article.create.published # => true def default_scope(options = {}) + reset_scoped_methods self.default_scoping << construct_finder_arel(options, default_scoping.pop) end |