From 908e9a17d8166d9b83609ec3aa877717a21d8ab7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 13 Apr 2005 05:16:52 +0000 Subject: Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 [yon@milliped.com] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1155 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ activerecord/lib/active_record/base.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 6804fc69fd..810fc94d97 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 [yon@milliped.com] + * Fixed boolean saving on Oracle #1093 [mparrish@pearware.org] * Moved build_association and create_association for has_one and belongs_to out of deprecation as they work when the association is nil unlike association.build and association.create, which require the association to be already in place #864 diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 3a1a590be8..7ef6532e52 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -662,9 +662,10 @@ module ActiveRecord #:nodoc: # Silences the logger for the duration of the block. def silence result = nil + old_logger_level = logger.level if logger logger.level = Logger::ERROR if logger result = yield - logger.level = Logger::DEBUG if logger + logger.level = old_logger_level if logger return result end -- cgit v1.2.3