aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_muc/mod_muc_room.erl3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d83430b74..e763d9b84 100644
--- 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 7fbaf555a..6b7bd0fff 100644
--- 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))
]}].