diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-25 12:09:13 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-25 12:09:13 +0100 |
| commit | eb8e627c6918dae53c7ab8b9208e72ff64d20348 (patch) | |
| tree | 4f153960d158c119ebdcef7a3a02c407e4b82dd0 /activesupport/lib/active_support/whiny_nil.rb | |
| parent | 4b8330d2d50ae4de14dd43ffbea4d91804553140 (diff) | |
| parent | 1c66f85eb6cd80053cf60889634a8c39c21b11a1 (diff) | |
| download | rails-eb8e627c6918dae53c7ab8b9208e72ff64d20348.tar.gz rails-eb8e627c6918dae53c7ab8b9208e72ff64d20348.tar.bz2 rails-eb8e627c6918dae53c7ab8b9208e72ff64d20348.zip | |
Merge branch 'master' of git://github.com/rails/rails
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 |