diff options
| author | francis <francis> | 2008-12-04 19:06:08 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-12-04 19:06:08 +0000 |
| commit | d8ee95d7f04f83b29d0ccc02a0e6a9e00fce5717 (patch) | |
| tree | 8241e0f294d1e3c6a2514c441b70243859a100f6 | |
| parent | 837c1685d3020b9fc72bfd2f904cbb79e0e0897a (diff) | |
Let censor rules determine mime type.
| -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 a3f3e6d07..7ccb1421d 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.173 2008-12-04 19:01:47 francis Exp $ +# $Id: incoming_message.rb,v 1.174 2008-12-04 19:06:08 francis Exp $ # TODO # Move some of the (e.g. quoting) functions here into rblib, as they feel @@ -529,7 +529,7 @@ class IncomingMessage < ActiveRecord::Base end # PDFs often come with this mime type, fix it up for view code if curr_mail.content_type == 'application/octet-stream' - calc_mime = filename_and_content_to_mimetype(TMail::Mail.get_part_file_name(curr_mail), curr_mail.body) + calc_mime = filename_and_content_to_mimetype(self.info_request.apply_censor_rules_to_text(TMail::Mail.get_part_file_name(curr_mail)), curr_mail.body) if calc_mime curr_mail.content_type = calc_mime end |