Merge remote branch 'drogus/engines'

3 files changed, 6 insertions, 6 deletions

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..835ba03784 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 = :main_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..26d76557dd 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
@@ -83,9 +83,9 @@ module TestGenerationPrefix
       end
 
       def url_to_application
-        path = app.url_for( :controller => "outside_engine_generating",
-                            :action => "index",
-                            :only_path => true)
+        path = main_app.url_for(:controller => "outside_engine_generating",
+                                :action => "index",
+                                :only_path => true)
         render :text => path
       end