aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-05-12 15:20:31 +0100
committerLouise Crow <louise.crow@gmail.com>2015-05-12 15:20:31 +0100
commit00c38f91a20b8b987f989b0892eb1e6910d1119d (patch)
tree4d5b63409f87ecbb2cd7b061f362c3fa6bc51d47 /lib
parentfab06473ece1c256e5b5ebeb7d8ae054af6e9ece (diff)
parent738dcb2a39099be6fa79f1810d87bef90b09c332 (diff)
Merge branch 'html-relative-path' into rails-3-develop
Diffstat (limited to 'lib')
-rw-r--r--lib/attachment_to_html/adapters/pdf.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/attachment_to_html/adapters/pdf.rb b/lib/attachment_to_html/adapters/pdf.rb
index 3c18e9d4a..a010b0342 100644
--- a/lib/attachment_to_html/adapters/pdf.rb
+++ b/lib/attachment_to_html/adapters/pdf.rb
@@ -71,10 +71,10 @@ module AttachmentToHTML
@converted ||= Dir.chdir(tmpdir) do
tempfile = create_tempfile(text)
-
html = AlaveteliExternalCommand.run("pdftohtml",
"-nodrm", "-zoom", "1.0", "-stdout", "-enc", "UTF-8",
- "-noframes", tempfile.path, :timeout => 30, :binary_output => false
+ "-noframes", "./#{File.basename(tempfile.path)}",
+ :timeout => 30, :binary_output => false
)
cleanup_tempfile(tempfile)