]> granicus.if.org Git - ejabberd/commitdiff
Revert "Fix IQ XML generation."
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sat, 5 Jul 2014 13:53:45 +0000 (17:53 +0400)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sat, 5 Jul 2014 13:53:45 +0000 (17:53 +0400)
This reverts commit 26a4d91297a7d7400dbdd30a063e163afa83fb22.

src/jlib.erl

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