aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_xmlrpc.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2019-10-18 11:52:03 +0200
committerBadlop <badlop@process-one.net>2019-10-18 13:16:37 +0200
commitb1d458999a28d8c295b6621a1c2937de8fa83ff2 (patch)
treea2aa760346f695f61212ebc5bbd53b0bb58aa217 /src/ejabberd_xmlrpc.erl
parentConvert oauth_expire option to accept timeout values (diff)
Flatten strings in ejabberd_xmlrpc error results
Diffstat (limited to 'src/ejabberd_xmlrpc.erl')
-rw-r--r--src/ejabberd_xmlrpc.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl
index 6e67dc4c4..9b4b119b6 100644
--- a/src/ejabberd_xmlrpc.erl
+++ b/src/ejabberd_xmlrpc.erl
@@ -342,8 +342,12 @@ process_unicode_codepoints(Str) ->
%% Result
%% -----------------------------
+format_result({error, Error}, _) when is_list(Error) ->
+ throw({error, lists:flatten(Error)});
format_result({error, Error}, _) ->
throw({error, Error});
+format_result({error, _Type, _Code, Error}, _) when is_list(Error) ->
+ throw({error, lists:flatten(Error)});
format_result({error, _Type, _Code, Error}, _) ->
throw({error, Error});
format_result(String, string) -> lists:flatten(String);