Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Revert "Fix IQ XML generation."

Browse Source 
This reverts commit 26a4d91297.
This commit is contained in:
Evgeniy Khramtsov 2014-07-05 17:53:45 +04:00
parent aba7150af1
commit 76ebebf2a0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jlib.erl
View File

@ -451,23 +451,15 @@ iq_type_to_string(error) -> <<"error">>.
). ).
iq_to_xml(#iq{id = ID, type = Type, sub_el = SubEl}) -> iq_to_xml(#iq{id = ID, type = Type, sub_el = SubEl}) ->
Children = case Type of
set ->
[SubEl];
get ->
[SubEl];
_ ->
SubEl
end,
if ID /= <<"">> -> if ID /= <<"">> ->
#xmlel{name = <<"iq">>, #xmlel{name = <<"iq">>,
attrs = attrs =
[{<<"id">>, ID}, {<<"type">>, iq_type_to_string(Type)}], [{<<"id">>, ID}, {<<"type">>, iq_type_to_string(Type)}],
children = Children}; children = SubEl};
true -> true ->
#xmlel{name = <<"iq">>, #xmlel{name = <<"iq">>,
attrs = [{<<"type">>, iq_type_to_string(Type)}], attrs = [{<<"type">>, iq_type_to_string(Type)}],
children = Children} children = SubEl}
end. end.
-spec(parse_xdata_submit/1 :: -spec(parse_xdata_submit/1 ::
@ -808,7 +800,7 @@ base64_to_term(Base64) ->
decode_base64(S) -> decode_base64(S) ->
decode_base64_bin(S, <<>>). decode_base64_bin(S, <<>>).
take_without_spaces(Bin, Count) -> take_without_spaces(Bin, Count) ->
take_without_spaces(Bin, Count, <<>>). take_without_spaces(Bin, Count, <<>>).
take_without_spaces(Bin, 0, Acc) -> take_without_spaces(Bin, 0, Acc) ->