From e70bd6bdfae3615a013cf6252efdea3d94c5b64c Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 27 May 2009 15:59:14 -0700
Subject: Added hook point in new base #send_action which does the actual
 action method dispatching

---
 actionpack/lib/action_controller/abstract/base.rb | 4 +++-
 actionpack/lib/action_controller/new_base/base.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 0e4803388a..bbd42623d3 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -95,9 +95,11 @@ module AbstractController
     # overrides it to include the case where a template matching the
     # action_name is found.
     def process_action(method_name)
-      send(method_name)
+      send_action(method_name)
     end
 
+    alias send_action send
+
     def _handle_action_missing
       action_missing(@_action_name)
     end
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 6fe7793030..f8aaf05387 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -39,7 +39,7 @@ module ActionController
     # TODO: Extract into its own module
     # This should be moved together with other normalizing behavior
     module ImplicitRender
-      def process_action(method_name)
+      def send_action(method_name)
         ret = super
         default_render unless performed?
         ret
-- 
cgit v1.2.3