vendor/rails/actionpack/lib/action_controller.rb in radiant-0.6.9 vs vendor/rails/actionpack/lib/action_controller.rb in radiant-0.7.0

- old
+ new

@@ -1,7 +1,7 @@ #-- -# Copyright (c) 2004-2007 David Heinemeier Hansson +# Copyright (c) 2004-2008 David Heinemeier Hansson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, @@ -53,12 +53,12 @@ require 'action_controller/session_management' require 'action_controller/http_authentication' require 'action_controller/components' require 'action_controller/record_identifier' require 'action_controller/request_forgery_protection' +require 'action_controller/headers' require 'action_view' -ActionController::Base.template_class = ActionView::Base ActionController::Base.class_eval do include ActionController::Flash include ActionController::Filters include ActionController::Layout