must force_encoding to utf-8 first

This commit is contained in:
Saito 2012-05-30 13:40:47 +08:00
parent c62715acc9
commit e851cb0776

View file

@ -8,12 +8,12 @@ module Gitlab
# return nil if message is nil
return nil unless message
message.force_encoding("utf-8")
# return message if message type is binary
detect = CharlockHolmes::EncodingDetector.detect(message)
return message if detect[:type] == :binary
# if message is utf-8 encoding, just return it
message.force_encoding("utf-8")
return message if message.valid_encoding?
# if message is not utf-8 encoding, convert it