]> granicus.if.org Git - ejabberd/commitdiff
Don't stop irc table conversion on broken JIDs
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 9 Jun 2014 06:35:52 +0000 (10:35 +0400)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 9 Jun 2014 06:36:42 +0000 (10:36 +0400)
src/mod_irc.erl

index 88f53a1c687e784d4a20193698f66c30ba556c0e..7b31a26a42f2bcd3cd4f3ad4bddbc8e320d77f8b 100644 (file)
@@ -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) ->