More community code review :)

4 files changed, 6 insertions, 12 deletions

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 8a8e748c0e..ab9aed0b26 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -54,7 +54,6 @@ module AbstractController
       
       @_action_name = action_name
       process_action
-      self.response_obj[:body] = self.response_body
       self
     end
     
@@ -71,7 +70,7 @@ module AbstractController
     # action_name is found.
     def process_action
       if respond_to?(action_name) then send(action_name)
-      elsif respond_to?(:action_missing, true) then send(:action_missing, action_name)
+      elsif respond_to?(:action_missing, true) then action_missing(action_name)
       end
     end
     
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 1f0b38417b..370e3a79ee 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -6,14 +6,7 @@ module AbstractController
       extlib_inheritable_accessor :master_helper_module
       self.master_helper_module = Module.new
     end
-  
-    # def self.included(klass)
-    #   klass.class_eval do
-    #     extlib_inheritable_accessor :master_helper_module
-    #     self.master_helper_module = Module.new
-    #   end
-    # end
-    
+
     def _action_view
       @_action_view ||= begin
         av = super
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 716b213c75..bed7f75b2f 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -20,13 +20,13 @@ module AbstractController
       
       self._view_paths ||= ActionView::PathSet.new
     end
-        
+    
     def _action_view
       @_action_view ||= ActionView::Base.new(self.class.view_paths, {}, self)      
     end
         
     def render(options = {})
-      unless response_body.nil?
+      if response_body
         raise AbstractController::DoubleRenderError, "OMG"
       end
       
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 446c735ba3..8477115211 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,5 +1,7 @@
 module ActionView #:nodoc:
   class TextTemplate < String #:nodoc:
+
+    def identifier() self end
     
     def render(*) self end