diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-19 06:26:13 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-19 06:26:13 -0700 |
| commit | b9e5c5aca3313bd67b35a608c504175f99172d7f (patch) | |
| tree | 5075061b731f1203dca6551cb1b696a246c916b6 /activerecord/lib/active_record/scoping/named.rb | |
| parent | 1166d49f62ccab789be208112163ad13183224e2 (diff) | |
| parent | ebfa58abc895c0639211cb896a47b04e424322c8 (diff) | |
| download | rails-b9e5c5aca3313bd67b35a608c504175f99172d7f.tar.gz rails-b9e5c5aca3313bd67b35a608c504175f99172d7f.tar.bz2 rails-b9e5c5aca3313bd67b35a608c504175f99172d7f.zip | |
Merge pull request #5898 from benedikt/3-2-stable
Readds the fix for #5667 and back ports the regression fix from #5718
Diffstat (limited to 'activerecord/lib/active_record/scoping/named.rb')
| -rw-r--r-- | activerecord/lib/active_record/scoping/named.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb index 9c50baa647..d6b0265fb3 100644 --- a/activerecord/lib/active_record/scoping/named.rb +++ b/activerecord/lib/active_record/scoping/named.rb @@ -34,7 +34,7 @@ module ActiveRecord if current_scope current_scope.clone else - scope = relation.clone + scope = relation scope.default_scoped = true scope end @@ -48,7 +48,7 @@ module ActiveRecord if current_scope current_scope.scope_for_create else - scope = relation.clone + scope = relation scope.default_scoped = true scope.scope_for_create end |