call encode! directly after force_encoding to play

nice with the internal encoding
sinatra · Jun 5, 2011 · 4511114 · 4511114
1 parent 42b8056
commit 4511114
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -1278,7 +1278,7 @@ def force_encoding(*args) settings.force_encoding(*args) end
       def self.force_encoding(data, encoding = default_encoding)
         return if data == settings || data.is_a?(Tempfile)
         if data.respond_to? :force_encoding
-          data.force_encoding encoding
+          data.force_encoding(encoding).encode!
         elsif data.respond_to? :each_value
           data.each_value { |v| force_encoding(v, encoding) }
         elsif data.respond_to? :each