mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
minor bug fixes related to the use/conversion of/to exmpp (thanks to Karim Gemayel)
SVN Revision: 2733
This commit is contained in:
parent
a1e9b55ead
commit
bde4b7b057
@ -132,20 +132,23 @@ get_options_xform(Lang, Options) ->
|
|||||||
children = [?XMLCDATA(?NS_PUBSUB_SUBSCRIBE_OPTIONS_s)]}]}] ++ XFields}}.
|
children = [?XMLCDATA(?NS_PUBSUB_SUBSCRIBE_OPTIONS_s)]}]}] ++ XFields}}.
|
||||||
|
|
||||||
parse_options_xform(XFields) ->
|
parse_options_xform(XFields) ->
|
||||||
case exmpp_xml:get_child_elements(XFields) of
|
case XFields of
|
||||||
[] -> {result, []};
|
[] -> {result, []};
|
||||||
[#xmlel{name = 'x'} = XEl] ->
|
_ -> case exmpp_xml:get_child_elements(XFields) of
|
||||||
case jlib:parse_xdata_submit(XEl) of
|
[] -> {result, []};
|
||||||
XData when is_list(XData) ->
|
[#xmlel{name = 'x'} = XEl] ->
|
||||||
case set_xoption(XData, []) of
|
case jlib:parse_xdata_submit(XEl) of
|
||||||
Opts when is_list(Opts) -> {result, Opts};
|
XData when is_list(XData) ->
|
||||||
Other -> Other
|
case set_xoption(XData, []) of
|
||||||
end;
|
Opts when is_list(Opts) -> {result, Opts};
|
||||||
Other ->
|
Other -> Other
|
||||||
Other
|
end;
|
||||||
end;
|
Other ->
|
||||||
Other ->
|
Other
|
||||||
Other
|
end;
|
||||||
|
Other ->
|
||||||
|
Other
|
||||||
|
end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
%%====================================================================
|
%%====================================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user