diff options
author | wycats <wycats@gmail.com> | 2010-09-11 03:24:50 -0500 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-09-11 03:24:50 -0500 |
commit | f6153f74da29f56017d5ddb8a2b8869d9b5835d7 (patch) | |
tree | 39de2f1a37cc755ed0e0950c012b47c61427bf83 /actionpack/lib | |
parent | 477df63433d8543ae8568de149e70d1bf1b41bb8 (diff) | |
parent | 497b6af8818f656fdbca9ed2470c1c16ae5ff1cd (diff) | |
download | rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.gz rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.bz2 rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.zip |
Merge remote branch 'drogus/engines'
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
2 files changed, 2 insertions, 2 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 |