diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-08-31 04:27:59 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-31 04:27:59 -0700 |
| commit | 47b8415bef7edb25bb750685d6f9331f044bbd80 (patch) | |
| tree | e408066b7c5df43b2e1b2fbc4f0ff5478f5efdab /actionpack/lib/action_controller/metal/instrumentation.rb | |
| parent | 6d772c0953b418da774b2c3bf5cc297508669da7 (diff) | |
| parent | e746c4047cd34accd7f63aa5d09cbb35011c24e2 (diff) | |
| download | rails-47b8415bef7edb25bb750685d6f9331f044bbd80.tar.gz rails-47b8415bef7edb25bb750685d6f9331f044bbd80.tar.bz2 rails-47b8415bef7edb25bb750685d6f9331f044bbd80.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal/instrumentation.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/instrumentation.rb | 6 |
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 |