Merge branch 'hb/edoc/wiki_encoding/OTP-9109' into dev

* hb/edoc/wiki_encoding/OTP-9109: Add encoding when parsing Wiki text
qqshfox · Mar 8, 2011 · 53d90ac · 53d90ac
2 parents f24f304 + 894d0f5
commit 53d90ac
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
@@ -82,7 +82,8 @@ parse_xml(Data, Line) ->
 
 parse_xml_1(Text, Line) ->
     Text1 = "<doc>" ++ Text ++ "</doc>",
-    case catch {ok, xmerl_scan:string(Text1, [{line, Line}])} of
+    Options = [{line, Line}, {encoding, "iso-8859-1"}],
+    case catch {ok, xmerl_scan:string(Text1, Options)} of
 	{ok, {E, _}} ->
 	    E#xmlElement.content;
 	{'EXIT', {fatal, {Reason, L, _C}}} ->