aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvgeny Khramtsov <ekhramtsov@process-one.net>2019-01-19 11:29:45 +0300
committerEvgeny Khramtsov <ekhramtsov@process-one.net>2019-01-19 11:29:45 +0300
commit5e9945f06047f726e143d6a55c65f7c79391a957 (patch)
treedd4b42edfaffbc2c7394a73ea8e12895ea384a47 /src
parentAdd os_mon to included_application, but start it in ej_system_monitor (diff)
Improve validation of configured language options
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_config.erl2
-rw-r--r--src/mod_muc.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index a7eea52d5..eaf513e77 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -1449,7 +1449,7 @@ opt_type(hosts) ->
[iolist_to_binary(H) || H <- L]
end;
opt_type(language) ->
- fun iolist_to_binary/1;
+ fun xmpp_lang:check/1;
opt_type(max_fsm_queue) ->
fun (I) when is_integer(I), I > 0 -> I end;
opt_type(default_db) ->
diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index 9ae35700e..29474e511 100644
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -988,7 +988,7 @@ mod_opt_type({default_room_options, presence_broadcast}) ->
end, L)
end;
mod_opt_type({default_room_options, lang}) ->
- fun iolist_to_binary/1.
+ fun xmpp_lang:check/1.
mod_options(Host) ->
[{access, all},