diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-04-02 14:45:59 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-04-02 14:45:59 +0100 |
| commit | 1de541184eaa011123763aba8803896cc6426fc8 (patch) | |
| tree | 0f39a01f7fa0e34e9328cf0199315f2923872aa7 /lib | |
| parent | d5a51cd73157fc5d15f5b300179b17221fb412a8 (diff) | |
| parent | 0a4c99a397e37064704c6706bf9c636d1157dbe2 (diff) | |
Merge branch 'hotfix/0.21.0.3' into rails-3-develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attachment_to_html/adapters/pdf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/attachment_to_html/adapters/pdf.rb b/lib/attachment_to_html/adapters/pdf.rb index 3183d1fd0..3c18e9d4a 100644 --- a/lib/attachment_to_html/adapters/pdf.rb +++ b/lib/attachment_to_html/adapters/pdf.rb @@ -42,7 +42,8 @@ module AttachmentToHTML private def parse_body - match = convert.match(/<body[^>]*>(.*?)<\/body>/mi) + conversion = convert + match = conversion ? conversion.match(/<body[^>]*>(.*?)<\/body>/mi) : nil match ? match[1] : '' end |