diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-17 16:43:12 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-17 16:43:12 +0000 |
| commit | 628d2cbd025307288375b939caa59b56ac26417a (patch) | |
| tree | c4d3712cb3698eb2a97dba20cda8363cb5a8a123 | |
| parent | e886720060a5bda9e11fdf06d101f6891f52e8c0 (diff) | |
Explicitly specify little-endian UCS-2
because for some reason iconv is assuming big-endian on my MacBook Pro
(OS X 10.7.2) unless told explicitly, and this causes test failure.
| -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 07736c902..2b8e82c6a 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -317,8 +317,8 @@ class IncomingMessage < ActiveRecord::Base emails = ascii_chars.scan(MySociety::Validate.email_find_regexp) # Convert back to UCS-2, making a mask at the same time emails.map! {|email| [ - Iconv.conv('ucs-2', 'ascii', email[0]), - Iconv.conv('ucs-2', 'ascii', email[0].gsub(/[^@.]/, 'x')) + Iconv.conv('ucs-2le', 'ascii', email[0]), + Iconv.conv('ucs-2le', 'ascii', email[0].gsub(/[^@.]/, 'x')) ] } # Now search and replace the UCS-2 email with the UCS-2 mask for email, mask in emails |