aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-08-02 02:55:01 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:10 +0200
commitbefa77fc18ba54c1be89553466312039c1073f02 (patch)
treecf154b7b05f185120c42614653fef38043c05ca6 /actionpack/lib/action_dispatch
parente063879daf55f100f316ad55f44a0df6d545693d (diff)
downloadrails-befa77fc18ba54c1be89553466312039c1073f02.tar.gz
rails-befa77fc18ba54c1be89553466312039c1073f02.tar.bz2
rails-befa77fc18ba54c1be89553466312039c1073f02.zip
Fix generating urls with mounted helpers in view context
There were actually 2 problems with this one: * script_name was added to options as a string and then it was used in RouteSet#url_for with usage of <<, which was changing the original script_name * the second issue was with _with_routes method. It was called in RoutesProxy to modify _routes in view_context, but url_helpers in views is just delegating it to controller, so another _with_routes call is needed there
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c67b0199ce..6e7e133cc5 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -307,7 +307,7 @@ module ActionDispatch
routes = self
MountedHelpers.class_eval do
define_method "_#{name}" do
- RoutesProxy.new(routes, (self.respond_to?(:controller) ? controller : self))
+ RoutesProxy.new(routes, self)
end
end