aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorYehuda Katz <yehudakatz@YK.local>2010-02-18 14:04:08 -0800
committerYehuda Katz <yehudakatz@YK.local>2010-02-18 14:04:26 -0800
commit98c299fba5bdaf3f1c156c2e16a5a95a5d9cf251 (patch)
treea750d779d9f1ad4e4d79ff684bd14fac10967f3e /activesupport/lib/active_support
parent8a1f057a26135f9b94717d72fff704843f56f521 (diff)
downloadrails-98c299fba5bdaf3f1c156c2e16a5a95a5d9cf251.tar.gz
rails-98c299fba5bdaf3f1c156c2e16a5a95a5d9cf251.tar.bz2
rails-98c299fba5bdaf3f1c156c2e16a5a95a5d9cf251.zip
Don't constantize possible module names when looking for new constants unless they exist
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/dependencies.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 87d56eb17e..107f664960 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -78,6 +78,7 @@ module ActiveSupport #:nodoc:
def new_constants_for(frames)
frames.map do |mod_name, prior_constants|
mod = Inflector.constantize(mod_name)
+ mod = Inflector.constantize(mod_name) if Dependencies.qualified_const_defined?(mod_name)
next unless mod.is_a?(Module)
new_constants = mod.local_constant_names - prior_constants