aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-20 22:31:44 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-20 22:31:44 -0700
commitea548c8df42215b08d33dd2808b2f5036c9d1996 (patch)
tree155cffab92352ad52fff8f26498a948443e7d090
parente4bcd5e7eb21905f66a2eec06cab874a312b787a (diff)
parentc9b5d64ec4c0b04881149214a5bc7bc9a40df596 (diff)
downloadrails-ea548c8df42215b08d33dd2808b2f5036c9d1996.tar.gz
rails-ea548c8df42215b08d33dd2808b2f5036c9d1996.tar.bz2
rails-ea548c8df42215b08d33dd2808b2f5036c9d1996.zip
Merge pull request #1178 from joshk/ruby19_warning
Corrected a minor ruby19 variable name reuse warning
-rw-r--r--activesupport/lib/active_support/buffered_logger.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index b937d4c50d..2668087f57 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -56,9 +56,9 @@ module ActiveSupport
end
def open_log(log, mode)
- open(log, mode).tap do |log|
- log.set_encoding(Encoding::BINARY) if log.respond_to?(:set_encoding)
- log.sync = true
+ open(log, mode).tap do |open_log|
+ open_log.set_encoding(Encoding::BINARY) if open_log.respond_to?(:set_encoding)
+ open_log.sync = true
end
end