aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionmailer/lib/action_mailer/railtie.rb2
-rw-r--r--actionpack/lib/action_controller/railtie.rb2
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
-rw-r--r--actionpack/test/dispatch/prefix_generation_test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index a2b00addc9..889ae34407 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -21,7 +21,7 @@ module ActionMailer
ActiveSupport.on_load(:action_mailer) do
include AbstractController::UrlFor
extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
- include app.routes.mounted_helpers(:app)
+ include app.routes.mounted_helpers
options.each { |k,v| send("#{k}=", v) }
end
end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index d26b7e2486..aea28d9265 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -27,7 +27,7 @@ module ActionController
options.page_cache_directory ||= paths.public.to_a.first
ActiveSupport.on_load(:action_controller) do
- include app.routes.mounted_helpers(:app)
+ include app.routes.mounted_helpers
extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
extend ::ActionController::Railties::Paths.with(app)
options.each { |k,v| send("#{k}=", v) }
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 956bd2e719..19a277a18c 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -262,7 +262,7 @@ module ActionDispatch
module MountedHelpers
end
- def mounted_helpers(name = nil)
+ def mounted_helpers(name = :app)
define_mounted_helper(name) if name
MountedHelpers
end
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index 3b47a1b72d..1e2df682b3 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -72,7 +72,7 @@ module TestGenerationPrefix
class ::InsideEngineGeneratingController < ActionController::Base
include BlogEngine.routes.url_helpers
- include RailsApplication.routes.mounted_helpers(:app)
+ include RailsApplication.routes.mounted_helpers
def index
render :text => posts_path