kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

rename part variable and guard against nil content_type

Browse source
This commit is contained in:
http://jneen.net/ 2016-11-16 14:39:07 +09:00
parent 64e98040a7
commit 4aabf707a9
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/gitlab/email/reply_parser.rb
View file

@ -23,15 +23,13 @@ module Gitlab
private
def select_body(message)
if message.multipart?
text = message.text_part || message.html_part || message
part = if message.multipart?
message.text_part || message.html_part || message
else
text = message
message
end
return "" unless text
decoded = fix_charset(text)
decoded = fix_charset(part)
return "" unless decoded
@ -40,7 +38,7 @@ module Gitlab
return ""
end
if text.content_type =~ %r(text/html)
if (part.content_type || '').include? 'text/html'
HTMLParser.parse_reply(decoded)
else
decoded