From: Paweł Chmielowski <pchmielowski@process-one.net>
Date: Thu, 20 Sep 2018 16:02:47 +0000 (+0200)
Subject: Recognize more fields that aren't atom in format_room_option
X-Git-Tag: 18.09~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b3a6dd54adba617a9ab59a050db18f942bf93ce;p=ejabberd

Recognize more fields that aren't atom in format_room_option
---

diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 7b702cdc5..f5213f212 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -361,7 +361,7 @@ build_summary_room(Name, Host, Pid) ->
     {<<Name/binary, "@", Host/binary>>,
 	 misc:atom_to_binary(Public),
      Participants
-    }.	  
+    }.
 
 muc_register_nick(Nick, FromBinary, ServerHost) ->
     Host = find_host(ServerHost),
@@ -950,6 +950,13 @@ format_room_option(OptionString, ValueString) ->
 		subject_author ->ValueString;
 		presence_broadcast ->misc:expr_to_term(ValueString);
 		max_users -> binary_to_integer(ValueString);
+		voice_request_min_interval -> binary_to_integer(ValueString);
+		vcard -> ValueString;
+		vcard_xupdate when ValueString /= <<"undefined">>,
+				   ValueString /= <<"external">> ->
+		    ValueString;
+		lang -> ValueString;
+		pubsub -> ValueString;
 		_ -> misc:binary_to_atom(ValueString)
 	    end,
     {Option, Value}.