jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into packaging

This commit is contained in:
Christophe Romain 2015-03-12 15:38:06 +01:00
parent f5677e7033 e209c00f26
commit 416e203e66
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod_admin_extra/src/mod_admin_extra.erl
View File

@ -1406,9 +1406,8 @@ send_packet_all_resources(FromJID, ToU, ToS, ToR, Packet) ->
ejabberd_router:route(FromJID, ToJID, Packet).
build_packet(Type, Subject, Body) ->
Tail = case Subject of
<<"chat">> -> [];
_ -> [{xmlel, <<"subject">>, [], [{xmlcdata, Subject}]}]
Tail = if Subject == <<"">>; Type == <<"chat">> -> [];
true -> [{xmlel, <<"subject">>, [], [{xmlcdata, Subject}]}]
end,
{xmlel, <<"message">>,
[{<<"type">>, Type}, {<<"id">>, randoms:get_string()}],