we are *sure* we want to set the encoding, so silence warnings around it

rails · Aug 24, 2011 · 3cbc1bd · 3cbc1bd
1 parent 8184373
commit 3cbc1bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
@@ -22,8 +22,10 @@
 if RUBY_VERSION < '1.9'
   $KCODE='u'
 else
-  Encoding.default_external = Encoding::UTF_8
+  silence_warnings do
-  Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+    Encoding.default_internal = Encoding::UTF_8
+  end
 end
 
 module Rails

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/string/encoding'
+require 'active_support/core_ext/kernel/reporting'
 require 'rails/engine/configuration'
 
 module Rails
@@ -53,8 +54,10 @@ def compiled_asset_path
       def encoding=(value)
         @encoding = value
         if "ruby".encoding_aware?
-          Encoding.default_external = value
+          silence_warnings do
-          Encoding.default_internal = value
+            Encoding.default_external = value
+            Encoding.default_internal = value
+          end
         else
           $KCODE = value
           if $KCODE == "NONE"