aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/incoming_message.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-08-20 15:58:11 +0100
committerLouise Crow <louise.crow@gmail.com>2013-08-20 15:58:11 +0100
commitce30500cea5c2d6304643bc90ce0c5b36a2f5919 (patch)
tree92ef48879721d017e7b72e663ef8dbc3d6421fb0 /app/models/incoming_message.rb
parentf757ce4ba02c6621e04a349376aeda1c1cb553a3 (diff)
parentdfb5f97ac44656f0e021b09856e0c54b9fa41b3f (diff)
Merge branch 'release/0.13'0.13
Conflicts: locale/bg/app.po locale/es/app.po locale/fi/app.po locale/fr/app.po locale/fr_CA/app.po locale/he_IL/app.po locale/hr/app.po locale/nb_NO/app.po locale/nl/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sl/app.po locale/vi/app.po script/rails-post-deploy
Diffstat (limited to 'app/models/incoming_message.rb')
-rw-r--r--app/models/incoming_message.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 4910d43f4..ae3c3b407 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -258,7 +258,7 @@ class IncomingMessage < ActiveRecord::Base
# Used by binary_mask_stuff - replace text in place
def _binary_mask_stuff_internal!(text)
# Keep original size, so can check haven't resized it
- orig_size = text.size
+ orig_size = text.mb_chars.size
# Replace ASCII email addresses...
text.gsub!(MySociety::Validate.email_find_regexp) do |email|
@@ -293,7 +293,7 @@ class IncomingMessage < ActiveRecord::Base
# Replace censor items
self.info_request.apply_censor_rules_to_binary!(text)
- raise "internal error in binary_mask_stuff" if text.size != orig_size
+ raise "internal error in binary_mask_stuff" if text.mb_chars.size != orig_size
return text
end