summaryrefslogtreecommitdiffstats
path: root/app/models/changeset.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/changeset.rb')
-rw-r--r--app/models/changeset.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 6475ae2d0..c94723ad9 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -256,7 +256,8 @@ class Changeset < ActiveRecord::Base
enc = encoding.blank? ? "UTF-8" : encoding
if enc != "UTF-8"
str.force_encoding(enc)
- str = str.encode("UTF-8")
+ str = str.encode("UTF-8", :invalid => :replace,
+ :undef => :replace, :replace => '?')
end
if ! str.valid_encoding?
str = str.encode("US-ASCII", :invalid => :replace,