diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-05-16 15:17:45 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-05-16 15:17:45 +0100 |
| commit | 0c2a485fc14bdd5855acfd367855782cbf2b6702 (patch) | |
| tree | ac7f1610ee690e2738f2e7554d80ebce8258f526 /lib/mail_handler/mail_handler.rb | |
| parent | 16ca4662692125290f8df336d71dc098af4b937b (diff) | |
| parent | 323318c600480e15f177e01f88946b15bad2db84 (diff) | |
Merge remote-tracking branch 'origin/hotfix/0.9.0.3' into rails-3-develop
Conflicts:
Rakefile
app/models/contact_mailer.rb
spec/models/contact_mailer_spec.rb
Diffstat (limited to 'lib/mail_handler/mail_handler.rb')
| -rw-r--r-- | lib/mail_handler/mail_handler.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb index d9ebee854..22ba26b97 100644 --- a/lib/mail_handler/mail_handler.rb +++ b/lib/mail_handler/mail_handler.rb @@ -77,7 +77,8 @@ module MailHandler tempfile.flush default_params = { :append_to => text, :binary_output => false } if content_type == 'application/vnd.ms-word' - AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt") + AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt", + { :memory_limit => 536870912 } ) # Try catdoc if we get into trouble (e.g. for InfoRequestEvent 2701) if not File.exists?(tempfile.path + ".txt") AlaveteliExternalCommand.run("catdoc", tempfile.path, default_params) |