diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-19 21:50:11 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-20 09:15:09 -0700 |
| commit | e1df4b956882f0c10a310088c1c13dcaa655a3b1 (patch) | |
| tree | f654652dc11c0840ed57ee24ee236a5174070a89 /activerecord/lib/active_record/named_scope.rb | |
| parent | 9df9c4bac008ba94c37faff411368c33408faff8 (diff) | |
| download | rails-e1df4b956882f0c10a310088c1c13dcaa655a3b1.tar.gz rails-e1df4b956882f0c10a310088c1c13dcaa655a3b1.tar.bz2 rails-e1df4b956882f0c10a310088c1c13dcaa655a3b1.zip | |
adding a reader for loaded, initializing @loaded to false
Diffstat (limited to 'activerecord/lib/active_record/named_scope.rb')
| -rw-r--r-- | activerecord/lib/active_record/named_scope.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb index 6596c695e2..417ff4b5eb 100644 --- a/activerecord/lib/active_record/named_scope.rb +++ b/activerecord/lib/active_record/named_scope.rb @@ -26,7 +26,7 @@ module ActiveRecord # You can define a \scope that applies to all finders using # ActiveRecord::Base.default_scope. def scoped(options = nil) - if options.present? + if options scoped.apply_finder_options(options) else current_scoped_methods ? relation.merge(current_scoped_methods) : relation.clone |