diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-30 19:38:20 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-01 00:09:55 +0200 |
| commit | 57d750edf7c71e001ac314fa188aa1fc6292f8ab (patch) | |
| tree | 5dc0c5492d1ee0ac09ef6abbb67871c0ddf7ae62 /activerecord/lib/active_record/named_scope.rb | |
| parent | c63cf7bf0db708fe46a929cf57649ab5a92034af (diff) | |
| download | rails-57d750edf7c71e001ac314fa188aa1fc6292f8ab.tar.gz rails-57d750edf7c71e001ac314fa188aa1fc6292f8ab.tar.bz2 rails-57d750edf7c71e001ac314fa188aa1fc6292f8ab.zip | |
Make relation a private method.
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 c010dac64e..849ec9c884 100644 --- a/activerecord/lib/active_record/named_scope.rb +++ b/activerecord/lib/active_record/named_scope.rb @@ -29,7 +29,7 @@ module ActiveRecord if options.present? scoped.apply_finder_options(options) else - current_scoped_methods ? unscoped.merge(current_scoped_methods) : unscoped.clone + current_scoped_methods ? relation.merge(current_scoped_methods) : relation.clone end end |