aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-03-08 10:54:29 +0100
committerHans Bolinder <[email protected]>2011-03-08 10:54:29 +0100
commit53d90ac1192db0ffe1cba6fbdad877744903bb3e (patch)
tree929b1964e2bc9c2fb9daa36b8ee90c7d014e48c4 /lib
parentf24f3043f8114ceaac4e46170cb2f24719a9db8b (diff)
parent894d0f58cf3b0957ccb6c35d812d792412a98556 (diff)
downloadotp-53d90ac1192db0ffe1cba6fbdad877744903bb3e.tar.gz
otp-53d90ac1192db0ffe1cba6fbdad877744903bb3e.tar.bz2
otp-53d90ac1192db0ffe1cba6fbdad877744903bb3e.zip
Merge branch 'hb/edoc/wiki_encoding/OTP-9109' into dev
* hb/edoc/wiki_encoding/OTP-9109: Add encoding when parsing Wiki text
Diffstat (limited to 'lib')
-rw-r--r--lib/edoc/src/edoc_wiki.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index e4a3d74734..b36aaae6ce 100644
--- 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}}} ->