Merge pull request rails#6395 from kennyj/fix_warning_20120519-2

Fix warning: shadowing outer local variable - constant.
groe · May 19, 2012 · 26bdcf7 · 26bdcf7
2 parents 329a5a4 + 3f1caaf
commit 26bdcf7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
@@ -212,10 +212,10 @@ def constantize(camel_cased_word)
 
           # Go down the ancestors to check it it's owned
           # directly before we reach Object or the end of ancestors.
-          constant = constant.ancestors.inject do |constant, ancestor|
-            break constant if ancestor == Object
+          constant = constant.ancestors.inject do |const, ancestor|
+            break const    if ancestor == Object
             break ancestor if ancestor.const_defined?(name, false)
-            constant
+            const
           end
 
           # owner is in Object, so raise