Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR

2 files changed, 5 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 2fad91495d..d71215b447 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -27,7 +27,7 @@ module ActiveSupport
       new_tags.size.times { tags.pop }
     end
 
-    def silence(temporary_level = ERROR, &block)
+    def silence(temporary_level = Logger::ERROR, &block)
       @logger.silence(temporary_level, &block)
     end
     deprecate :silence
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index 17c4214dfc..dbf8a71e9a 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -64,4 +64,8 @@ class TaggedLoggingTest < ActiveSupport::TestCase
 
     assert_equal "[BCX] [Jason] Funky time\n[BCX] Junky time!\n", @output.string
   end
+
+  test "silence" do
+    assert_nothing_raised { @logger.silence {} }
+  end
 end