From 6c04eb2115cd65d480f1d7c95cbc86a5d39a41ca Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Mon, 5 Jun 2006 15:48:29 +0000 Subject: Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4438 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/routing.rb') 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 -- cgit v1.2.3