aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJanko Luin <janko@luin.se>2013-03-19 12:55:26 +0100
committerJanko Luin <janko@luin.se>2013-03-20 08:20:54 +0100
commit0dfa6cb97c77775164f8009d6be82e697bd25add (patch)
tree53030ad666b0879bfebc183f86dfe679d4710387 /actionpack/lib/action_controller
parent66ac0c567dfcc6a31568d270dba335eb1971abc3 (diff)
downloadrails-0dfa6cb97c77775164f8009d6be82e697bd25add.tar.gz
rails-0dfa6cb97c77775164f8009d6be82e697bd25add.tar.bz2
rails-0dfa6cb97c77775164f8009d6be82e697bd25add.zip
Fix broken ActionController#action_missing
A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/hide_actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb
index 2aa6b7adaf..af36ffa240 100644
--- a/actionpack/lib/action_controller/metal/hide_actions.rb
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -27,7 +27,7 @@ module ActionController
end
def visible_action?(action_name)
- action_methods.include?(action_name)
+ not hidden_actions.include?(action_name)
end
# Overrides AbstractController::Base#action_methods to remove any methods