25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00

If log uses file:write, no need to double escape ~ in messages (EJAB-1696)

This commit is contained in:
Badlop 2014-05-20 14:49:52 +02:00
parent 6d06f22f64
commit 5010cea1a4

View File

@ -779,7 +779,7 @@ fw(F, S, O, FileFormat) ->
S1y = ejabberd_regexp:greplace(S1x, ?PLAINTEXT_IN, <<"<">>),
ejabberd_regexp:greplace(S1y, ?PLAINTEXT_OUT, <<">">>)
end,
io:format(F, S2, []).
file:write(F, S2).
put_header(_, _, _, _, _, _, _, _, _, plaintext) -> ok;
put_header(F, Room, Date, CSSFile, Lang, Hour_offset,
@ -1017,7 +1017,7 @@ htmlize2(S1, NoFollow) ->
S7 = ejabberd_regexp:greplace(S6, <<"\\t">>,
<<"\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;">>),
S8 = ejabberd_regexp:greplace(S7, <<"~">>,
<<"~~~~">>),
<<"~~">>),
ejabberd_regexp:greplace(S8, <<226, 128, 174>>,
<<"[RLO]">>).