aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorFranck Verrot <franck@verrot.fr>2011-08-14 18:58:29 +0200
committerFranck Verrot <franck@verrot.fr>2011-08-14 19:00:30 +0200
commit75dd33a0aed96d9f03b79c82f7e5bc5ccf462e8e (patch)
tree9741d9de1ed134ec82b51daa34416c2e2b97fef4 /actionpack/lib
parentbf2b9d2de3f85e880e5afa980e6fd65b1f07557c (diff)
downloadrails-75dd33a0aed96d9f03b79c82f7e5bc5ccf462e8e.tar.gz
rails-75dd33a0aed96d9f03b79c82f7e5bc5ccf462e8e.tar.bz2
rails-75dd33a0aed96d9f03b79c82f7e5bc5ccf462e8e.zip
Methods like status and location are interfering with redirect_to [Closes #2511]
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/instrumentation.rb6
1 files changed, 3 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