diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 20:10:11 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 20:10:11 +0000 |
| commit | 3e7a4ecc57da31c908982f933de65d33ebbfc344 (patch) | |
| tree | 92e7667f726b4755e61a87d99f08b3c4053bf1fa /actionpack/lib | |
| parent | 1f6c4aca28c5514e5d1b96b6372398aba76a3776 (diff) | |
| download | rails-3e7a4ecc57da31c908982f933de65d33ebbfc344.tar.gz rails-3e7a4ecc57da31c908982f933de65d33ebbfc344.tar.bz2 rails-3e7a4ecc57da31c908982f933de65d33ebbfc344.zip | |
Fixed redirects when the controller and action is named the same. Still haven't fixed same controller, module, and action, though #201 [Josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/url_rewriter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb index a3ff8fac32..cb6baf2c13 100644 --- a/actionpack/lib/action_controller/url_rewriter.rb +++ b/actionpack/lib/action_controller/url_rewriter.rb @@ -91,7 +91,7 @@ module ActionController path = path.sub(%r(#{@controller}/?), @controller + "/" + action_name(options)) # " ruby-mode end else - path = path.sub((action_prefix || "") + @action + (action_suffix || ""), action_name(options, action_prefix)) + path = path.sub(@controller + "/" + (action_prefix || "") + @action + (action_suffix || ""), @controller + "/" + action_name(options, action_prefix)) end if options[:controller_prefix] && !options[:controller] |