* src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description...

SVN Revision: 989

diff --git a/ChangeLog b/ChangeLog
index d83430b749bcffaed6ba8c30dd02c92af8566f67..e763d9b841b2bab1e393c3811a81d0ccf0b99885 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-27  Badlop  <badlop@process-one.net>
+
+       * src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382).
+
 2007-11-26  Badlop  <badlop@process-one.net>
 
        * src/ejabberd.cfg.example: Added example configuration of databases.

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 7fbaf555ae5e7ee48ee20bfef7bd3218ece9f953..6b7bd0fff9570c7d41c7d7f2ec451ea151900e14 100644 (file)
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -2851,9 +2851,6 @@ iq_disco_info_extras(Lang, StateData) ->
     [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "result"}],
       [?RFIELDT("hidden", "FORM_TYPE",
                "http://jabber.org/protocol/muc#roominfo"),
-       ?RFIELD("Description", "muc#roominfo_description",
-              (StateData#state.config)#config.title),
-       %?RFIELD("Subject", "muc#roominfo_subject", StateData#state.subject),
        ?RFIELD("Number of occupants", "muc#roominfo_occupants",
               integer_to_list(Len))
       ]}].