diff options
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 0b8d9c0a73..3590513325 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -955,7 +955,9 @@ module ActionController # on admin/get, and the new controller is 'set', the new controller # should really be admin/set. if expire_on[:controller] && options[:controller] && options[:controller][0] != ?/ - parts = recall[:controller].split('/')[0..-2] + [options[:controller]] + old_parts = recall[:controller].split('/') + new_parts = options[:controller].split('/') + parts = old_parts[0..-(new_parts.length + 1)] + new_parts options[:controller] = parts.join('/') end |