diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-11-20 13:45:27 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-11-20 13:45:27 +0300 |
| commit | 982215d64481fb03123f776b788d24d2637de5b4 (patch) | |
| tree | 2b4c966f4914286eff05bc0b29b807ad538f45cc /src | |
| parent | Merge pull request #351 from weiss/floating-muc-intervals (diff) | |
| parent | Fix for ejabbed bug #359 - now strings are formatted correctly. (diff) | |
Merge pull request #360 from lbanders/master
Fix for ejabbed bug #359 - now strings are formatted correctly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_xmlrpc.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl index c3b2fdab7..b59001819 100644 --- a/src/ejabberd_xmlrpc.erl +++ b/src/ejabberd_xmlrpc.erl @@ -448,8 +448,8 @@ format_arg({array, Elements}, {list, ElementsDef}) format_arg(Arg, integer) when is_integer(Arg) -> Arg; format_arg(Arg, binary) when is_list(Arg) -> list_to_binary(Arg); format_arg(Arg, binary) when is_binary(Arg) -> Arg; -format_arg(Arg, string) when is_list(Arg) -> list_to_binary(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(Arg, Format) -> ?ERROR_MSG("don't know how to format Arg ~p for format ~p", [Arg, Format]), throw({error_formatting_argument, Arg, Format}). |