diff options
| author | francis <francis> | 2008-12-18 19:44:26 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-12-18 19:44:26 +0000 |
| commit | 54548d0a3e00a44b74c1002a57f6c499079e55ed (patch) | |
| tree | a13b3f64b94c7469746fbcf7c8a16be364baeb4d | |
| parent | ed39acdc209936eb0070ad3f09fe08c037b06f81 (diff) | |
Better output upon error.
| -rw-r--r-- | app/models/incoming_message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 2e47e69f4..59695514e 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -19,7 +19,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.177 2008-12-18 19:21:09 francis Exp $ +# $Id: incoming_message.rb,v 1.178 2008-12-18 19:44:26 francis Exp $ # TODO # Move some of the (e.g. quoting) functions here into rblib, as they feel @@ -235,7 +235,7 @@ class FOIAttachment # We need to look at the output size as well, as pdftohtml does not # return an error code upon error. if !$?.success? || html.size == 0 - raise "No output from child process in body_as_html for mime " + self.content_type + return "<html><head></head><body><p>Conversion to HTML failed (no output from child process). Please use the download link.</p></body></html>" end return html |