summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSaito <saitowu@gmail.com>2011-12-13 00:41:31 +0800
committerJeremy Mack <jmacktdkc@gmail.com>2011-12-13 13:20:45 -0500
commita1cd582c67b10abbda6c2fb2c99d8735138d33db (patch)
tree309d12702bf8be39a752e4c0379a2bf2f4467884 /lib
parent2201ef80200d0a3f896a30fe10aa3a2c71b7bde1 (diff)
downloadgitlab-ce-a1cd582c67b10abbda6c2fb2c99d8735138d33db.tar.gz
fix can not guess problem
Diffstat (limited to 'lib')
-rw-r--r--lib/utils.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/utils.rb b/lib/utils.rb
index 17c9dfe3dd2..2de14761444 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -18,13 +18,14 @@ module Utils
module CharEncode
def encode(string)
+ return '' unless string
cd = CharDet.detect(string)
if cd.confidence > 0.6
string.force_encoding(cd.encoding)
end
string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
rescue
- "Invalid code encoding"
+ "Invalid Encoding"
end
end