lib/action_controller.rb in actionpack-1.2.0 vs lib/action_controller.rb in actionpack-1.3.0

- old
+ new

@@ -21,10 +21,11 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ $:.unshift(File.dirname(__FILE__)) +require 'action_controller/support/core_ext' require 'action_controller/support/clean_logger' require 'action_controller/support/misc' require 'action_controller/support/dependencies' require 'action_controller/base' @@ -37,10 +38,11 @@ require 'action_controller/dependencies' require 'action_controller/scaffolding' require 'action_controller/helpers' require 'action_controller/cookies' require 'action_controller/cgi_process' +require 'action_controller/caching' ActionController::Base.class_eval do include ActionController::Filters include ActionController::Layout include ActionController::Flash @@ -49,9 +51,10 @@ include ActionController::Dependencies include ActionController::Scaffolding include ActionController::Helpers include ActionController::Cookies include ActionController::Session + include ActionController::Caching end require 'action_view' ActionController::Base.template_class = ActionView::Base \ No newline at end of file