diff options
| author | David Cabo <david@calibea.com> | 2011-08-17 11:05:21 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-17 11:05:21 +0200 |
| commit | 817ce18d16d037aadc5ea44d93854c6e17f06747 (patch) | |
| tree | 1820f4a62c1060063e0b9751473eca9610142598 /app/models/incoming_message.rb | |
| parent | 0ca78b7c2abfe28ef7acd7137fda5d82a973c2e1 (diff) | |
| parent | e1a2e1ad36c6b0c7bfac501eb2a0d0ae5efd05a1 (diff) | |
Merge branch 'fixes' into asktheeu
Diffstat (limited to 'app/models/incoming_message.rb')
| -rw-r--r-- | app/models/incoming_message.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index ae7d1201e..b0b02fdda 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -569,7 +569,8 @@ class IncomingMessage < ActiveRecord::Base text.gsub!(/(Complaints and Corporate Affairs Officer)\s+Westminster Primary Care Trust.+/ms, "\\1") # Remove WhatDoTheyKnow signup links - text.gsub!(/http:\/\/www.whatdotheyknow.com\/c\/[^\s]+/, "[WDTK login link]") + domain = MySociety::Config.get('DOMAIN') + text.gsub!(/http:\/\/#{domain}\/c\/[^\s]+/, "[WDTK login link]") # Remove Home Office survey links # e.g. http://www.whatdotheyknow.com/request/serious_crime_act_2007_section_7#incoming-12650 @@ -1134,7 +1135,7 @@ class IncomingMessage < ActiveRecord::Base elsif content_type == 'text/html' # lynx wordwraps links in its output, which then don't get formatted properly # by Alaveteli. We use elinks instead, which doesn't do that. - external_command("/usr/bin/elinks", "-dump-charset", "utf-8", "-force-html", "-dump", + external_command("/usr/bin/elinks", "-eval", "'set document.codepage.assume = \"utf-8\"'", "-dump-charset", "utf-8", "-force-html", "-dump", tempfile.path, :append_to => text) elsif content_type == 'application/vnd.ms-excel' # Bit crazy using /usr/bin/strings - but xls2csv, xlhtml and |