aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-06 01:13:15 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-06 01:13:15 -0500
commit1d8623b42f6249613d39e834a8742b3b143f2aff (patch)
treef8316aab80fd86c15008d218d2a33717ff4b3c74 /actionpack/lib/action_view/template.rb
parent7b9e8ae2734089555e5bfdb9e9c80d92f43551a2 (diff)
downloadrails-1d8623b42f6249613d39e834a8742b3b143f2aff.tar.gz
rails-1d8623b42f6249613d39e834a8742b3b143f2aff.tar.bz2
rails-1d8623b42f6249613d39e834a8742b3b143f2aff.zip
Added local assign keys to compiled method name so two threads evaluating the same template with different locals don't step on top of each other
Diffstat (limited to 'actionpack/lib/action_view/template.rb')
-rw-r--r--actionpack/lib/action_view/template.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 069d7d57af..5e5ea9b9b9 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -20,7 +20,7 @@ module ActionView #:nodoc:
set_extension_and_file_name
@method_segment = compiled_method_name_file_path_segment
- @locals = locals || {}
+ @locals = (locals && locals.dup) || {}
@handler = self.class.handler_class_for_extension(@extension).new(@view)
end