aboutsummaryrefslogtreecommitdiffstats
path: root/lib/normalize_string.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/normalize_string.rb')
-rw-r--r--lib/normalize_string.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/normalize_string.rb b/lib/normalize_string.rb
index de847cd16..1205a1d9c 100644
--- a/lib/normalize_string.rb
+++ b/lib/normalize_string.rb
@@ -76,9 +76,12 @@ def convert_string_to_utf8(s, suggested_character_encoding=nil)
begin
result = normalize_string_to_utf8 s, suggested_character_encoding
rescue EncodingNormalizationError
- result = s.force_encoding("utf-8").encode("utf-8", :invalid => :replace,
- :undef => :replace,
- :replace => "") if String.method_defined?(:encode)
+ result = s
+ if String.method_defined?(:encode)
+ result = s.force_encoding("utf-8").encode("utf-8", :invalid => :replace,
+ :undef => :replace,
+ :replace => "")
+ end
end
result
end