diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-30 10:30:58 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-30 10:30:58 +0200 |
| commit | 1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f (patch) | |
| tree | 0c74273f34c20e56975a6b7845a034fa3df8c469 /actionpack/lib | |
| parent | 69f97f469747777ed1c457715f5361f6b8a0ab7b (diff) | |
| parent | 9f569c60adb3505cd7ca1723481199bf26619038 (diff) | |
| download | rails-1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f.tar.gz rails-1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f.tar.bz2 rails-1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f.zip | |
Merge remote branch 'drogus/engines'
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 5d18dfe369..32f41934f1 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -1,6 +1,7 @@ require 'rack/mount' require 'forwardable' require 'active_support/core_ext/object/to_query' +require 'active_support/core_ext/hash/slice' module ActionDispatch module Routing @@ -511,7 +512,7 @@ module ActionDispatch end script_name = options.delete(:script_name) - path = (script_name.blank? ? _generate_prefix(options) : script_name).to_s + path = (script_name.blank? ? _generate_prefix(options) : script_name.chomp('/')).to_s path_options = options.except(*RESERVED_OPTIONS) path_options = yield(path_options) if block_given? |