diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-06-06 13:55:53 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-06-06 13:55:53 +0100 |
| commit | 552b08318cff55e12defccd4d617f4eb59e13204 (patch) | |
| tree | 1341dd3964a37016993ee268e7400bebeb2f1f44 /lib/attachment_to_html | |
| parent | 3448434a89521fdf48f338e8d22283d10b6af6a3 (diff) | |
| parent | 895fffedf54ae9ea4168cf03ca5aa55f93a93b49 (diff) | |
Merge remote-tracking branch 'origin/hotfix/0.18.0.3' into rails-3-develop
Diffstat (limited to 'lib/attachment_to_html')
| -rw-r--r-- | lib/attachment_to_html/adapters/rtf.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/attachment_to_html/adapters/rtf.rb b/lib/attachment_to_html/adapters/rtf.rb index 859c0e541..95f499689 100644 --- a/lib/attachment_to_html/adapters/rtf.rb +++ b/lib/attachment_to_html/adapters/rtf.rb @@ -73,6 +73,8 @@ module AttachmentToHTML # Works around http://savannah.gnu.org/bugs/?42015 in unrtf ~> 0.21 def sanitize_converted(html) + html.nil? ? html = '' : html + invalid = %Q(<!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN>) valid = %Q(<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN>") if html.include?(invalid) |