aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-02-13 13:47:04 +0000
committerLouise Crow <louise.crow@gmail.com>2015-02-13 13:47:04 +0000
commitb0c0b6063c3b39e2da8e50fbaaf08f10adf45320 (patch)
tree29d91bccd57215d1e91ccbcffbeca89efd3a6a89 /lib
parent890efdeae239d0c44def4b25c87441300fd1bbee (diff)
parent3d3f7b268c652a0e948c069b21a704091496506b (diff)
Merge branch 'hotfix/0.20.0.11' into rails-3-develop
Diffstat (limited to 'lib')
-rw-r--r--lib/attachment_to_html/adapters/pdf.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/attachment_to_html/adapters/pdf.rb b/lib/attachment_to_html/adapters/pdf.rb
index b91958c52..3183d1fd0 100644
--- a/lib/attachment_to_html/adapters/pdf.rb
+++ b/lib/attachment_to_html/adapters/pdf.rb
@@ -73,11 +73,10 @@ module AttachmentToHTML
html = AlaveteliExternalCommand.run("pdftohtml",
"-nodrm", "-zoom", "1.0", "-stdout", "-enc", "UTF-8",
- "-noframes", tempfile.path, :timeout => 30
+ "-noframes", tempfile.path, :timeout => 30, :binary_output => false
)
cleanup_tempfile(tempfile)
-
html
end
end