3 files changed, 17 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/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 0e3db86861..ef3b89db14 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -56,6 +56,18 @@ module ActionController
     end
 
     module ClassMethods
+      def helpers_dir
+        ActiveSupport::Deprecation.warn "ActionController::Base.helpers_dir is deprecated. " <<
+          "Please use ActionController::Base.helpers_path (which returns an array)"
+        self.helpers_path
+      end
+
+      def helpers_dir=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.helpers_dir= is deprecated. " <<
+          "Please use ActionController::Base.helpers_path= (which is an array)"
+        self.helpers_path = Array(value)
+      end
+
       def inherited(klass)
         klass.class_eval { default_helper_module! unless name.blank? }
         super
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