Merge branch 'release/0.13' into wdtk

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index 3c924dcb3..ff6a8e34e 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -328,7 +328,18 @@ describe IncomingMessage, " when censoring data" do
         data.should == "His email was x\000x\000x\000@\000x\000x\000x\000.\000x\000x\000x\000, indeed"
     end
 
-
+    it 'should handle multibyte characters correctly', :focus => true do
+        orig_data = 'á'
+        data = orig_data.dup
+        @regex_censor_rule = CensorRule.new()
+        @regex_censor_rule.text = 'á'
+        @regex_censor_rule.regexp = true
+        @regex_censor_rule.replacement = 'cat'
+        @regex_censor_rule.last_edit_editor = 'unknown'
+        @regex_censor_rule.last_edit_comment = 'none'
+        @im.info_request.censor_rules << @regex_censor_rule
+        lambda{ @im.binary_mask_stuff!(data, "text/plain") }.should_not raise_error
+    end
 
     def pdf_replacement_test(use_ghostscript_compression)
         config = MySociety::Config.load_default()