aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMickaël Rémond <mickael.remond@process-one.net>2006-07-06 16:06:44 +0000
committerMickaël Rémond <mickael.remond@process-one.net>2006-07-06 16:06:44 +0000
commit6225c951fdaec5c97d5b68347f33e031ec11c542 (patch)
treef22242f111bb785a7ae40f431360e5dcd3aa8c78 /src
parent* src/mod_shared_roster.erl: Shared roster entries can now be (diff)
* 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 (EJAB-115). SVN Revision: 587
Diffstat (limited to 'src')
-rw-r--r--src/mod_muc/mod_muc_room.erl2
1 files changed, 1 insertions, 1 deletions
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 ->