From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Sat, 5 Jul 2014 13:53:45 +0000 (+0400)
Subject: Revert "Fix IQ XML generation."
X-Git-Tag: 14.07~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76ebebf2a084375043da1bcf46c7998c944a0320;p=ejabberd

Revert "Fix IQ XML generation."

This reverts commit 26a4d91297a7d7400dbdd30a063e163afa83fb22.
---

diff --git a/src/jlib.erl b/src/jlib.erl
index 549c9b71b..7735d7dbc 100644
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -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) ->