@@ -49,7 +49,6 @@ require 'action_controller/verification' require 'action_controller/streaming' require 'action_controller/session_management' require 'action_controller/http_authentication' -require 'action_controller/components' require 'action_controller/rack_process' require 'action_controller/record_identifier' require 'action_controller/request_forgery_protection' @@ -72,7 +71,6 @@ ActionController::Base.class_eval do include ActionController::Streaming include ActionController::SessionManagement include ActionController::HttpAuthentication::Basic::ControllerMethods - include ActionController::Components include ActionController::RecordIdentifier include ActionController::RequestForgeryProtection include ActionController::Translation actionpack/lib/action_controller.rb @@ -529,7 +529,7 @@ module ActionController #:nodoc: end def send_response - response.prepare! unless component_request? + response.prepare! response end actionpack/lib/action_controller/base.rb @@ -165,7 +165,7 @@ module ActionController #:nodoc: def assign_shortcuts_with_flash(request, response) #:nodoc: assign_shortcuts_without_flash(request, response) flash(:refresh) - flash.sweep if @_session && !component_request? + flash.sweep if @_session end end end actionpack/lib/action_controller/flash.rb actionpack/lib/action_controller/components.rb actionpack/test/controller/components_test.rb 130fe74d17404e5c06353526c7b20beb4019cb69 27c03e69e94655482b0d77d3ae0ca902ce537f8c David Heinemeier Hansson dhh david@loudthinking.com http://github.com/rails/rails/commit/e442448fa3f706062ef9c89912c1fd95e1119f67 e442448fa3f706062ef9c89912c1fd95e1119f67 2008-11-19T05:06:15-08:00 2008-11-19T05:06:15-08:00 Changed the default of ActionView#render to assume partials instead of files when not given an options hash [DHH] 5ee0b4cb78a05be4eb7558469200486bb7739f93 David Heinemeier Hansson dhh david@loudthinking.com