aboutsummaryrefslogtreecommitdiff
path: root/src/mod_muc/mod_muc_log.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2013-05-31 13:23:08 +0200
committerBadlop <badlop@process-one.net>2013-05-31 13:23:08 +0200
commitd1e119179329159e197551ebe0053609e89d68ce (patch)
tree7c9b997da07501d61afa7643f43e5f45a833e1e7 /src/mod_muc/mod_muc_log.erl
parentHandle ~ control sequence in text of mod_muc_log (EJAB-1639) (diff)
Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
Diffstat (limited to 'src/mod_muc/mod_muc_log.erl')
-rw-r--r--src/mod_muc/mod_muc_log.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl
index 95b25d6a7..ec62c85fd 100644
--- a/src/mod_muc/mod_muc_log.erl
+++ b/src/mod_muc/mod_muc_log.erl
@@ -977,9 +977,9 @@ htmlize(S1, FileFormat) ->
%% The NoFollow parameter tell if the spam prevention should be applied to the link found
%% true means 'apply nofollow on links'.
htmlize(S0, _NoFollow, plaintext) ->
- S1 = ejabberd_regexp:greplace(S0, <<"~">>, ?PLAINTEXT_CO),
- S1x = ejabberd_regexp:replace(S1, <<"<">>, ?PLAINTEXT_IN),
- ejabberd_regexp:replace(S1x, <<">">>, ?PLAINTEXT_OUT);
+ S1 = ejabberd_regexp:greplace(S0, <<"~">>, ?PLAINTEXT_CO),
+ S1x = ejabberd_regexp:greplace(S1, <<"<">>, ?PLAINTEXT_IN),
+ ejabberd_regexp:greplace(S1x, <<">">>, ?PLAINTEXT_OUT);
htmlize(S1, NoFollow, _FileFormat) ->
S2_list = str:tokens(S1, <<"\n">>),
lists:foldl(fun (Si, Res) ->