fix can not guess problem

Saito
1 parent 822c0a50
Showing 3 changed files with 3 additions and 3 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/commits_helper.rb
lib/utils.rb
 require 'digest/md5'
 module ApplicationHelper
+  include Utils::CharEncode
  
   def gravatar_icon(user_email)
     gravatar_host = request.ssl? ? "https://secure.gravatar.com" :  "http://www.gravatar.com"
 module CommitsHelper
-  include Utils::CharEncode
-
   def old_line_number(line, i)
  
   end
@@ -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
1	1	require 'digest/md5'
2	2	module ApplicationHelper
	3	+ include Utils::CharEncode
3	4
4	5	def gravatar_icon(user_email)
5	6	gravatar_host = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com"
...	...
1	1	module CommitsHelper
2		- include Utils::CharEncode
3		-
4	2	def old_line_number(line, i)
5	3
6	4	end
...	...
...	...	@@ -18,13 +18,14 @@ module Utils
18	18
19	19	module CharEncode
20	20	def encode(string)
	21	+ return '' unless string
21	22	cd = CharDet.detect(string)
22	23	if cd.confidence > 0.6
23	24	string.force_encoding(cd.encoding)
24	25	end
25	26	string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
26	27	rescue
27		- "Invalid code encoding"
	28	+ "Invalid Encoding"
28	29	end
29	30	end
30	31
...	...