Merge pull request #2527 from cesario/fix_2511

Methods like status and location are interfering with redirect_to [Closes #2511]

2 files changed, 8 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 85d0f5f699..777a0ab343 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -58,8 +58,8 @@ module ActionController
     def redirect_to(*args)
       ActiveSupport::Notifications.instrument("redirect_to.action_controller") do |payload|
         result = super
-        payload[:status]   = self.status
-        payload[:location] = self.location
+        payload[:status]   = response.status
+        payload[:location] = response.location
         result
       end
     end
@@ -97,4 +97,4 @@ module ActionController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 92d4a6d98b..79041055bd 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -4,6 +4,11 @@ class WorkshopsController < ActionController::Base
 end
 
 class RedirectController < ActionController::Base
+  # empty method not used anywhere to ensure methods like
+  # `status` and `location` aren't called on `redirect_to` calls
+  def status; render :text => 'called status'; end
+  def location; render :text => 'called location'; end
+
   def simple_redirect
     redirect_to :action => "hello_world"
   end