From 1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 18 May 2007 00:36:14 +0000 Subject: Clean up the simply_helpful merge. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6751 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller/base.rb') 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 -- cgit v1.2.3