aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2014-06-09 10:35:52 +0400
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2014-06-09 10:36:42 +0400
commitc485aea48bcdc6cf4c562f624cfcdbf59ee96820 (patch)
tree59d7ca53c70ea3bd03485ce4e2b2d13665b08a29 /src
parentIgnore malformed parameters for mod_irc module (diff)
Don't stop irc table conversion on broken JIDs
Diffstat (limited to 'src')
-rw-r--r--src/mod_irc.erl14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mod_irc.erl b/src/mod_irc.erl
index 88f53a1c6..7b31a26a4 100644
--- a/src/mod_irc.erl
+++ b/src/mod_irc.erl
@@ -1229,10 +1229,16 @@ data_to_binary(JID, Data) ->
try
[conn_param_to_binary(Param)]
catch _:_ ->
- ?ERROR_MSG("failed to convert parameter "
- " ~p for user ~s",
- [Param, jlib:jid_to_string(JID)]),
- []
+ if JID /= error ->
+ ?ERROR_MSG("failed to convert "
+ "parameter ~p for user ~s",
+ [Param,
+ jlib:jid_to_string(JID)]);
+ true ->
+ ?ERROR_MSG("failed to convert "
+ "parameter ~p",
+ [Param])
+ end
end
end, Params)};
(Opt) ->