Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb

1 files changed, 7 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/new_base/hide_actions.rb b/actionpack/lib/action_controller/new_base/hide_actions.rb
index 473a8ea72b..a29b09a893 100644
--- a/actionpack/lib/action_controller/new_base/hide_actions.rb
+++ b/actionpack/lib/action_controller/new_base/hide_actions.rb
@@ -1,17 +1,19 @@
 module ActionController
   module HideActions
-    setup do
+    extend ActiveSupport::DependencyModule
+
+    included do
       extlib_inheritable_accessor :hidden_actions
-      self.hidden_actions ||= Set.new      
+      self.hidden_actions ||= Set.new
     end
-    
+
     def action_methods() self.class.action_names end
     def action_names() action_methods end    
       
   private
   
-    def respond_to_action?(action_name)
-      !hidden_actions.include?(action_name) && (super || respond_to?(:method_missing))
+    def action_method?(action_name)
+      !hidden_actions.include?(action_name) && super
     end
     
     module ClassMethods