diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-26 11:41:58 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-26 11:41:58 -0800 |
| commit | 5dab9bd2cdf4a97ecfacde39a038ea7a2c682f1b (patch) | |
| tree | b009bdea1043640b633c9d7c6b8adc4f02f5c014 /activesupport/lib | |
| parent | 82ba5c469f8c287329f697be557ac46f34508111 (diff) | |
| parent | 7598284c0bd9de93d9bfec4607a64953be1e30f8 (diff) | |
| download | rails-5dab9bd2cdf4a97ecfacde39a038ea7a2c682f1b.tar.gz rails-5dab9bd2cdf4a97ecfacde39a038ea7a2c682f1b.tar.bz2 rails-5dab9bd2cdf4a97ecfacde39a038ea7a2c682f1b.zip | |
Merge pull request #4711 from atambo/master
3.2 safe_constantize should handle wrong constant name NameErrors Fixes #4710
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/inflector/methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb index 9b0f0e859a..4e6eb27756 100644 --- a/activesupport/lib/active_support/inflector/methods.rb +++ b/activesupport/lib/active_support/inflector/methods.rb @@ -243,7 +243,7 @@ module ActiveSupport begin constantize(camel_cased_word) rescue NameError => e - raise unless e.message =~ /uninitialized constant #{const_regexp(camel_cased_word)}$/ || + raise unless e.message =~ /(uninitialized constant|wrong constant name) #{const_regexp(camel_cased_word)}$/ || e.name.to_s == camel_cased_word.to_s rescue ArgumentError => e raise unless e.message =~ /not missing constant #{const_regexp(camel_cased_word)}\!$/ |