diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-24 15:12:13 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-24 15:12:13 -0800 |
| commit | e9d659224bb6610d726bd333a9425b4f8f5796ba (patch) | |
| tree | 53896b07fb022135d19377a7f2f38aaf22ef4fcc /actionpack/lib/action_controller/metal/compatibility.rb | |
| parent | 2647a3cabfb88ac0dac318207bf611b0b66d495f (diff) | |
| parent | 2a12a04a54590d3a5f2abf4cd4eff3a7b1ee6ef4 (diff) | |
| download | rails-e9d659224bb6610d726bd333a9425b4f8f5796ba.tar.gz rails-e9d659224bb6610d726bd333a9425b4f8f5796ba.tar.bz2 rails-e9d659224bb6610d726bd333a9425b4f8f5796ba.zip | |
Merge pull request #9406 from rails/3-2-stable-ruby-2
Rails 3.2.x is now compatible with Ruby 2.0.0
Diffstat (limited to 'actionpack/lib/action_controller/metal/compatibility.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index de3354d4f9..9d1ff8cbe4 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -58,7 +58,8 @@ module ActionController end def method_for_action(action_name) - super || (respond_to?(:method_missing) && "_handle_method_missing") + super || ((self.class.public_method_defined?(:method_missing) || + self.class.protected_method_defined?(:method_missing)) && "_handle_method_missing") end end end |