Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2016-11-10 13:15:34 +0300
committerPaweł Chmielowski <pchmielowski@process-one.net>2016-11-15 12:02:21 +0300
commit717159a98fe925260578aeedd4436eb6ae5df4f8 (patch)
treed7ab6bc18fa68d9d9ad18c9b70be3aba2f25582d /src/mod_http_api.erl
parent309962fb8b70dc42dbfcc98b4e64bd251aad84b9 (diff)
Make string args in http_api be list strings
Diffstat (limited to 'src/mod_http_api.erl')
-rw-r--r--src/mod_http_api.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl
index 881587ede..a189777b1 100644
--- a/src/mod_http_api.erl
+++ b/src/mod_http_api.erl
@@ -273,7 +273,7 @@ handle(Call, Auth, Args, Version) when is_atom(Call), is_list(Args) ->
fun ({Key, binary}, Acc) ->
[{Key, <<>>}|Acc];
({Key, string}, Acc) ->
- [{Key, <<>>}|Acc];
+ [{Key, ""}|Acc];
({Key, integer}, Acc) ->
[{Key, 0}|Acc];
({Key, {list, _}}, Acc) ->
@@ -406,10 +406,10 @@ format_arg(Elements, {list, ElementsDef})
format_arg(Arg, integer) when is_integer(Arg) -> Arg;
format_arg(Arg, binary) when is_list(Arg) -> process_unicode_codepoints(Arg);
format_arg(Arg, binary) when is_binary(Arg) -> Arg;
-format_arg(Arg, string) when is_list(Arg) -> process_unicode_codepoints(Arg);
-format_arg(Arg, string) when is_binary(Arg) -> Arg;
+format_arg(Arg, string) when is_list(Arg) -> Arg;
+format_arg(Arg, string) when is_binary(Arg) -> binary_to_list(Arg);
format_arg(undefined, binary) -> <<>>;
-format_arg(undefined, string) -> <<>>;
+format_arg(undefined, string) -> "";
format_arg(Arg, Format) ->
?ERROR_MSG("don't know how to format Arg ~p for format ~p", [Arg, Format]),
throw({invalid_parameter,