aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-02-21 03:17:41 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-02-21 03:17:41 -0800
commitc4265914fb1775b09a8a29f606f1b9535e5d4146 (patch)
tree71a06a722a6259f946c3eaeca76dcb9c0c8d0384 /activerecord
parentb80d8f71112279f989ad3accbfed277a25cedd57 (diff)
parent39d461703361834c2e51dd9179afce0f8a0a83ff (diff)
downloadrails-c4265914fb1775b09a8a29f606f1b9535e5d4146.tar.gz
rails-c4265914fb1775b09a8a29f606f1b9535e5d4146.tar.bz2
rails-c4265914fb1775b09a8a29f606f1b9535e5d4146.zip
Merge pull request #5106 from kennyj/fix_warnings_20120210
[3-2-stable] Fix some warnings
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/counter_cache.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb
index c9c46b8d4f..ee0b0c7fab 100644
--- a/activerecord/lib/active_record/counter_cache.rb
+++ b/activerecord/lib/active_record/counter_cache.rb
@@ -19,7 +19,7 @@ module ActiveRecord
counters.each do |association|
has_many_association = reflect_on_association(association.to_sym)
- expected_name = if has_many_association.options[:as]
+ if has_many_association.options[:as]
has_many_association.options[:as].to_s.classify
else
self.name