diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-27 12:09:20 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-27 12:09:20 +0100 |
| commit | 47e5caa96bffc04c8c0b287a975a609fb048e530 (patch) | |
| tree | 653d360dc9ad7eb7c5d2338840e15ab8b28a902b /activesupport/lib/active_support/whiny_nil.rb | |
| parent | fd58a2d1da04508a7fdf825143e61d186112e63e (diff) | |
| parent | d92c4a84023bc0c8dd75869c9b4d5e50277f4650 (diff) | |
| download | rails-47e5caa96bffc04c8c0b287a975a609fb048e530.tar.gz rails-47e5caa96bffc04c8c0b287a975a609fb048e530.tar.bz2 rails-47e5caa96bffc04c8c0b287a975a609fb048e530.zip | |
Merge Mail with latest Rails and move mail gem to Gemfile.
Diffstat (limited to 'activesupport/lib/active_support/whiny_nil.rb')
| -rw-r--r-- | activesupport/lib/active_support/whiny_nil.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb index c3ed659d6b..4f6ff7d3b5 100644 --- a/activesupport/lib/active_support/whiny_nil.rb +++ b/activesupport/lib/active_support/whiny_nil.rb @@ -43,10 +43,7 @@ class NilClass private def method_missing(method, *args, &block) - # Ruby 1.9.2: disallow explicit coercion via method_missing. - if method == :to_ary || method == :to_str - raise NoMethodError, "undefined method `#{method}' for nil:NilClass" - elsif klass = METHOD_CLASS_MAP[method] + if klass = METHOD_CLASS_MAP[method] raise_nil_warning_for klass, method, caller else super |