From 6bc24d40d56332593bc22612d4618a2f80b1d91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sch=C3=BCrrer?= Date: Sun, 21 Feb 2010 17:21:25 +0100 Subject: Use ActionDispatch::Routing everywhere --- actionpack/lib/action_controller/metal/compatibility.rb | 4 ++-- actionpack/lib/action_controller/metal/url_for.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_controller/metal') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index a1cfa32d4d..136b024d9e 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -20,8 +20,8 @@ module ActionController class << self delegate :default_charset=, :to => "ActionDispatch::Response" - delegate :resources_path_names, :to => "ActionController::Routing::Routes" - delegate :resources_path_names=, :to => "ActionController::Routing::Routes" + delegate :resources_path_names, :to => "ActionDispatch::Routing::Routes" + delegate :resources_path_names=, :to => "ActionDispatch::Routing::Routes" end # cattr_reader :protected_instance_variables diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 4f3ad07be5..0a9ea7fe1a 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -6,7 +6,7 @@ module ActionController # is also possible: an URL can be generated from one of your routing definitions. # URL generation functionality is centralized in this module. # - # See ActionController::Routing and ActionController::Resources for general + # See ActionDispatch::Routing and ActionController::Resources for general # information about routing and routes.rb. # # Tip: If you need to generate URLs from your models or some other place, @@ -87,7 +87,7 @@ module ActionController extend ActiveSupport::Concern included do - ActionController::Routing::Routes.install_helpers(self) + ActionDispatch::Routing::Routes.install_helpers(self) # Including in a class uses an inheritable hash. Modules get a plain hash. if respond_to?(:class_attribute) -- cgit v1.2.3