diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
| commit | 5446d5cb05b50a9a3f317ded774be438e0eff909 (patch) | |
| tree | 6b0b87efe3e95783763208215a3159fb63217a6d /activesupport/lib/active_support/core_ext/name_error.rb | |
| parent | 9754debb9a72f9385950e5282f3642b995ab76d8 (diff) | |
| parent | f8877d4b2a2a6f68770b376f0b1391a6295f62f2 (diff) | |
| download | rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.gz rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.bz2 rails-5446d5cb05b50a9a3f317ded774be438e0eff909.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activesupport/lib/active_support/core_ext/hash/conversions.rb
Diffstat (limited to 'activesupport/lib/active_support/core_ext/name_error.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/name_error.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/name_error.rb b/activesupport/lib/active_support/core_ext/name_error.rb index cd165626c8..e1ebd4f91c 100644 --- a/activesupport/lib/active_support/core_ext/name_error.rb +++ b/activesupport/lib/active_support/core_ext/name_error.rb @@ -1,7 +1,9 @@ class NameError # Extract the name of the missing constant from the exception message. def missing_name - $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message + if /undefined local variable or method/ !~ message + $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message + end end # Was this exception raised because the given name was missing? |