diff options
| author | badlop <badlop@process-one.net> | 2016-04-06 13:25:46 +0200 |
|---|---|---|
| committer | badlop <badlop@process-one.net> | 2016-04-06 13:25:46 +0200 |
| commit | dd654fa79416cad01d9aac1cbcb04fab729b25bc (patch) | |
| tree | 0a9dee34d8e852d9d466bebbcb659c72f6d04a4d /src | |
| parent | Merge branch 'master' of github.com:processone/ejabberd (diff) | |
| parent | Fix mod_muc_admin:get_room_options (diff) | |
Merge pull request #1052 from genric/patch-2
Fix mod_muc_admin:get_room_options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc_admin.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index 7c6e84c45..037f26006 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -824,8 +824,12 @@ get_room_options(Pid) -> get_options(Config). get_options(Config) -> - Fields = record_info(fields, config), - [config | Values] = tuple_to_list(Config), + Fields = [jlib:atom_to_binary(Field) || Field <- record_info(fields, config)], + [config | ValuesRaw] = tuple_to_list(Config), + Values = lists:map(fun(V) when is_atom(V) -> jlib:atom_to_binary(V); + (V) when is_integer(V) -> jlib:integer_to_binary(V); + (V) when is_tuple(V); is_list(V) -> list_to_binary(hd(io_lib:format("~w", [V]))); + (V) -> V end, ValuesRaw), lists:zip(Fields, Values). %%---------------------------- |