aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_c2s.erl5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e15121bfa..108c9a0cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-18 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/ejabberd_c2s.erl: Bugfix (thanks to Sergei Golovan)
+
2006-03-17 Alexey Shchepin <alexey@sevcom.net>
* src/mod_privacy.erl: Fixed privacy list pushing (thanks to
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index ec6fd73a8..08d93f742 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1016,7 +1016,6 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
[{exit, Reason}] ->
{exit, Attrs, Reason};
[{privacy_list, PrivList, PrivListName}] ->
- {false, Attrs,
case catch mod_privacy:updated_list(
StateData#state.privacy_list,
PrivList) of
@@ -1038,8 +1037,8 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
StateData#state.jid,
jlib:iq_to_xml(PrivPushIQ)),
send_element(StateData, PrivPushEl),
- StateData#state{privacy_list = NewPL}
- end};
+ {false, Attrs, StateData#state{privacy_list = NewPL}}
+ end;
_ ->
{false, Attrs, StateData}
end;