aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-25 01:06:12 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-25 01:12:22 +0100
commit3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f (patch)
treeacd1fdb20cd5a63e6867c2befb07de8f46ab66ec /actionpack
parent396003fc48d7c0ba206ad059646c7414bee22a36 (diff)
downloadrails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.tar.gz
rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.tar.bz2
rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.zip
Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/deprecated.rb1
-rw-r--r--actionpack/lib/action_controller/railtie.rb9
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb
index 589061e77c..edc0e5b3fe 100644
--- a/actionpack/lib/action_controller/deprecated.rb
+++ b/actionpack/lib/action_controller/deprecated.rb
@@ -2,3 +2,4 @@ ActionController::AbstractRequest = ActionController::Request = ActionDispatch::
ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response
ActionController::Routing = ActionDispatch::Routing
ActionController::Routing::Routes = ActionDispatch::Routing::RouteSet.new
+ActionController::UrlWriter = AbstractController::UrlFor
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index f15c012471..29a0a346ec 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -8,17 +8,16 @@ module ActionController
require "action_controller/railties/subscriber"
subscriber ActionController::Railties::Subscriber.new
+ initializer "action_controller.logger" do
+ ActionController::Base.logger ||= Rails.logger
+ end
+
initializer "action_controller.set_configs" do |app|
app.config.action_controller.each do |k,v|
ActionController::Base.send "#{k}=", v
end
end
- # TODO: ActionController::Base.logger should delegate to its own config.logger
- initializer "action_controller.logger" do
- ActionController::Base.logger ||= Rails.logger
- end
-
initializer "action_controller.initialize_framework_caches" do
ActionController::Base.cache_store ||= RAILS_CACHE
end