diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-18 00:36:14 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-18 00:36:14 +0000 |
| commit | 1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18 (patch) | |
| tree | 9efe8a7754037e0782c8872f04f3703c6aa10f4f /actionpack/lib/action_controller/base.rb | |
| parent | ebee0a742d40f87bb9b78d5d88393c341761cfad (diff) | |
| download | rails-1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18.tar.gz rails-1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18.tar.bz2 rails-1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18.zip | |
Clean up the simply_helpful merge.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6751 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7afacd4f69..a10ac44939 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -560,7 +560,7 @@ module ActionController #:nodoc: when Hash @url.rewrite(rewrite_options(options)) else - polymorphic_url(options, self) + polymorphic_url(options) end end @@ -1034,7 +1034,6 @@ module ActionController #:nodoc: else redirect_to(url_for(options)) - response.redirected_to = options end end |