diff options
author | Martin Schürrer <martin@schuerrer.org> | 2010-02-21 17:21:25 +0100 |
---|---|---|
committer | Yehuda Katz <yehudakatz@YK.local> | 2010-02-21 13:43:51 -0800 |
commit | 6bc24d40d56332593bc22612d4618a2f80b1d91b (patch) | |
tree | e49938db28fe51f5c45efde3dec5793e65694da0 /actionpack/lib/action_controller/metal | |
parent | 4cdfe98d925397a613c9220bca65be5081c92f56 (diff) | |
download | rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.gz rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.bz2 rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.zip |
Use ActionDispatch::Routing everywhere
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 4 |
2 files changed, 4 insertions, 4 deletions
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. # # <b>Tip:</b> 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) |