aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-22 12:26:27 +0200
committerJosé Valim <jose.valim@gmail.com>2011-09-22 12:26:37 +0200
commit1ca3fbfbf2dfc9b2bff46ca680a89e005a1fc2d2 (patch)
tree36629f25caffeae7ae48d5c2af0358e622c0826d /actionpack
parent8de0bbe0b48b1d5a05a4159dd6197d6c9cff7979 (diff)
downloadrails-1ca3fbfbf2dfc9b2bff46ca680a89e005a1fc2d2.tar.gz
rails-1ca3fbfbf2dfc9b2bff46ca680a89e005a1fc2d2.tar.bz2
rails-1ca3fbfbf2dfc9b2bff46ca680a89e005a1fc2d2.zip
No need to recalculate the @details_key after update_details.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/lookup_context.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index a119df003a..a1fa1c0b6f 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -93,14 +93,13 @@ module ActionView
# the execution of the block and reverted to the previous value after.
def update_details(new_details)
if block_given?
- old_details = @details.dup
+ old_details, old_key = @details.dup, @details_key
super
begin
yield
ensure
- @details_key = nil
- @details = old_details
+ @details, @details_key = old_details, old_key
end
else
super