codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add more diagnostics to encoding issues

Browse source
This commit is contained in:
Sam 2014-10-03 19:45:42 +10:00
parent f5912a5500
commit f2957b126e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/freedom_patches/safe_buffer.rb
View file

@ -15,18 +15,20 @@ class ActiveSupport::SafeBuffer
raise
else
encoding_diags = "internal encoding #{Encoding.default_internal}, external encoding #{Encoding.default_external}"
unless encoding == Encoding::UTF_8
self.force_encoding("UTF-8")
unless valid_encoding?
encode!("utf-16","utf-8",:invalid => :replace)
encode!("utf-8","utf-16")
end
Rails.logger.warn("Encountered a non UTF-8 string in SafeBuffer - #{self}")
Rails.logger.warn("Encountered a non UTF-8 string in SafeBuffer - #{self} - #{encoding_diags}")
end
unless value.encoding == Encoding::UTF_8
value = value.dup.force_encoding("UTF-8").scrub
Rails.logger.warn("Attempted to concat a non UTF-8 string in SafeBuffer - #{value}")
Rails.logger.warn("Attempted to concat a non UTF-8 string in SafeBuffer - #{value} - #{encoding_diags}")
end
concat(value,_raise=true)