diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-09-06 20:47:25 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-08 19:27:59 +0200 |
| commit | 18aee333359a4dea6847754f3055ce223aa2474c (patch) | |
| tree | 1593b92ca59e5398151fe6e786b197b33cbc9736 /actionpack/lib | |
| parent | a5d894ce566a21ec4c5db9df06be7f22a1690691 (diff) | |
| download | rails-18aee333359a4dea6847754f3055ce223aa2474c.tar.gz rails-18aee333359a4dea6847754f3055ce223aa2474c.tar.bz2 rails-18aee333359a4dea6847754f3055ce223aa2474c.zip | |
Do not require passing :app to mounted helpers, it's actually useless and not DRY
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..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 |