diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-23 17:08:04 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-23 17:08:04 -0700 |
| commit | ee7516436ebb0c415c1b977dfde0fcf42ac017f4 (patch) | |
| tree | f900df87beff72c7e537fc3224a658758b3b2207 | |
| parent | 67978d624582c8aff1abeeadec9447bddd16ef3b (diff) | |
| download | rails-ee7516436ebb0c415c1b977dfde0fcf42ac017f4.tar.gz rails-ee7516436ebb0c415c1b977dfde0fcf42ac017f4.tar.bz2 rails-ee7516436ebb0c415c1b977dfde0fcf42ac017f4.zip | |
oops!
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index d3a56c870a..73d154e03e 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -594,7 +594,7 @@ module ActiveRecord # We want to use the klass from this reflection, rather than just delegate straight to # the source_reflection, because the source_reflection may be polymorphic. We still # need to respect the source_reflection's :primary_key option, though. - def association_primary_key(target_class = nil) + def association_primary_key(klass = nil) # Get the "actual" source reflection if the immediate source reflection has a # source reflection itself actual_source_reflection.options[:primary_key] || primary_key(klass || self.klass) |