diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2012-10-30 14:18:32 +0200 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2012-10-30 14:18:32 +0200 |
| commit | 37d3a4e1f51f0c16c728ef620b55c394b0363d2d (patch) | |
| tree | 0b4fd7e4735315e7062601bdbb5fce68f786d087 /src | |
| parent | Fixed "message" tag checking in standby mode (diff) | |
| parent | Show binaries as strings in WebAdmin; handle tab characters. (diff) | |
Merge branch '3.0.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/web/ejabberd_web_admin.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 106c036f5..65c524796 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -1070,15 +1070,17 @@ pretty_sentence([Char | A], R) -> pretty_sentence(A, [Char | R]). pretty_binary([$>, $> | A], "") -> - {A, ">>" ++ "<<"}; + {A, "\"\""}; pretty_binary([$>, $> | A], R) -> - {A, ">>" ++ io_lib:format("~p", [lists:reverse(R)]) ++ "<<"}; + {A, io_lib:format("~p", [lists:reverse(R)])}; pretty_binary([$, | A], R) -> pretty_binary(A, R); pretty_binary([32 | A], R) -> pretty_binary(A, R); pretty_binary([$\n | A], R) -> pretty_binary(A, R); +pretty_binary([$\t | A], R) -> + pretty_binary(A, R); pretty_binary([Digit1, Digit2, Other | A], R) when (Other == $>) or (Other == $,) -> Integer = list_to_integer([Digit1, Digit2]), pretty_binary([Other | A], [Integer | R]); |