aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_muc/mod_muc_room.erl2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 592f90926..c76e67191 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
* src/mod_roster.erl: Likewise.
* src/mod_roster_odbc.erl: Likewise.
+ * src/mod_muc/mod_muc_room.erl: Fixed the order in which room presence
+ packets are sent (First existing presence to new occupant, then new
+ occupant presence to existing users.
+
2006-07-05 Mickael Remond <mickael.remond@process-one.net>
* src/web/ejabberd_web_admin.erl: More flexible parsing the shared
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 8efe16a14..ff163b782 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -1002,8 +1002,8 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
true ->
ok
end,
- send_new_presence(From, NewState),
send_existing_presences(From, NewState),
+ send_new_presence(From, NewState),
Shift = count_stanza_shift(Nick, Els, NewState),
case send_history(From, Shift, NewState) of
true ->