From 668c64b48d6343f166a4f21cff79337558097c39 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 4 Sep 2006 08:28:44 +0000
Subject: [PATCH] quell warnings

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4982 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activesupport/lib/active_support/breakpoint.rb  | 5 +++++
 activesupport/lib/active_support/deprecation.rb | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/activesupport/lib/active_support/breakpoint.rb b/activesupport/lib/active_support/breakpoint.rb
index 785dac7596208..8207117ced83a 100755
--- a/activesupport/lib/active_support/breakpoint.rb
+++ b/activesupport/lib/active_support/breakpoint.rb
@@ -460,6 +460,11 @@ def result.last_value; end
       old_CurrentContext
     end
   end
+
+  class << self
+    alias :old_parse_opts :parse_opts
+    remove_method :parse_opts
+  end
   def IRB.parse_opts() end
 
   class Context #:nodoc:
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index 845fb4d62b28d..22ff90642a0ed 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -65,6 +65,9 @@ def extract_callstack(callstack)
     mattr_accessor :behavior
     self.behavior = default_behavior
 
+    # Warnings are not silenced by default.
+    self.silenced = false
+
     module ClassMethods
       # Declare that a method has been deprecated.
       def deprecate(*method_names)