diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-22 11:28:58 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-22 11:28:58 +0000 |
commit | 3835f6ab25053a64d9bac63bda5d3b62a242f91a (patch) | |
tree | a47eceab9c27958e4400746d687016c320783cfb /actionpack/lib/action_view/base.rb | |
parent | d76439239dc7b8870afef34afccfedcd1ffd7ad0 (diff) | |
download | rails-3835f6ab25053a64d9bac63bda5d3b62a242f91a.tar.gz rails-3835f6ab25053a64d9bac63bda5d3b62a242f91a.tar.bz2 rails-3835f6ab25053a64d9bac63bda5d3b62a242f91a.zip |
Changed caching/expiration/hit to report using the DEBUG log level and errors to use the ERROR log level instead of both using INFO
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1889 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 15f1ea739c..6ffdd55a7e 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -323,8 +323,8 @@ module ActionView #:nodoc: def rhtml_render(extension, template, file_name, local_assigns) render_sym = compile_erb_template(template, file_name) saved_locals = evaluate_assigns(local_assigns) - result = self.send render_sym - saved_locals.each{|k,v| instance_variable_set k,v } + result = self.send(render_sym) + saved_locals.each { |k,v| instance_variable_set(k, v) } result end @@ -333,7 +333,7 @@ module ActionView #:nodoc: saved_locals = evaluate_assigns(local_assigns) xml = Builder::XmlMarkup.new(:indent => 2) result = eval(template, binding, '(template)(eval)', 1) - saved_locals.each{|k,v| instance_variable_set k,v } + saved_locals.each { |k,v| instance_variable_set(k,v) } result end |