github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 03:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

need to figure out encoding before forcing.

Browse Source
This commit is contained in:
Sam 2014-10-30 17:48:31 +11:00
parent 75ffb0a425
commit 222f9fee38
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/freedom_patches/safe_buffer.rb
View File

@ -18,6 +18,8 @@ class ActiveSupport::SafeBuffer
encoding_diags = "internal encoding #{Encoding.default_internal}, external encoding #{Encoding.default_external}"
unless encoding == Encoding::UTF_8
encoding_diags << " my encoding is #{encoding} "
self.force_encoding("UTF-8")
unless valid_encoding?
encode!("utf-16","utf-8",:invalid => :replace)
@ -27,6 +29,9 @@ class ActiveSupport::SafeBuffer
end
unless value.encoding == Encoding::UTF_8
encoding_diags << " attempted to append encoding #{value.encoding} "
value = value.dup.force_encoding("UTF-8").scrub
Rails.logger.warn("Attempted to concat a non UTF-8 string in SafeBuffer - #{value} - #{encoding_diags}")
end