diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/abstract_controller/railties/routes_helpers.rb (renamed from actionpack/lib/action_controller/railties/routes_helpers.rb) | 7 | ||||
-rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb index a23f703f0b..dec1e9d6d9 100644 --- a/actionpack/lib/action_controller/railties/routes_helpers.rb +++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb @@ -1,4 +1,4 @@ -module ActionController +module AbstractController module Railties module RoutesHelpers def self.with(routes) @@ -6,9 +6,10 @@ module ActionController define_method(:inherited) do |klass| super(klass) if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) } - routes = namespace._railtie.routes + klass.send(:include, namespace._railtie.routes.url_helpers) + else + klass.send(:include, routes.url_helpers) end - klass.send(:include, routes.url_helpers) end end end diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 23622b19e8..4b5a897b90 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -4,7 +4,7 @@ require "action_dispatch/railtie" require "action_view/railtie" require "active_support/deprecation/proxy_wrappers" require "active_support/deprecation" -require "action_controller/railties/routes_helpers" +require "abstract_controller/railties/routes_helpers" module ActionController class Railtie < Rails::Railtie @@ -51,7 +51,7 @@ module ActionController options.helpers_path ||= paths.app.helpers.to_a ActiveSupport.on_load(:action_controller) do - extend ::ActionController::Railties::RoutesHelpers.with(app.routes) + extend ::AbstractController::Railties::RoutesHelpers.with(app.routes) include app.routes.mounted_helpers(:app) options.each { |k,v| send("#{k}=", v) } end |