2 files changed, 11 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index b6e15a4e0d..505675ec4d 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -23,6 +23,15 @@ module ActionController
       
       cattr_accessor :default_charset
       self.send(:class_variable_set, "@@default_charset", "utf-8")
+      
+      cattr_reader :protected_instance_variables
+      self.send(:class_variable_set, "@@protected_instance_variables", %w(@assigns @performed_redirect @performed_render @variables_added @request_origin @url @parent_controller
+                                          @action_name @before_filter_chain_aborted @action_cache_path @_headers @_params
+                                          @_flash @_response))
+    end
+    
+    module ClassMethods
+      def protect_from_forgery() end
     end
   
     def render_to_body(options)
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 4c4a74979b..bedd1d7a23 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -23,8 +23,8 @@ module ActionController
         options[:_template] = template
       elsif options.key?(:template)
         options[:_template_name] = options[:template]
-      elsif options.key?(:action)
-        options[:_template_name] = options[:action].to_s
+      else
+        options[:_template_name] = (options[:action] || action_name).to_s
         options[:_prefix] = _prefix 
       end