* src/mod_roster.erl: Fixed "from" attribute in roster pushes

* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1214

diff --git a/ChangeLog b/ChangeLog
index 9d210be619dbd55f9bd633d79330107b50af2c5f..ac23630cf901b87144b620386eab3c0cdd80a7f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29  Alexey Shchepin  <alexey@process-one.net>
+
+       * src/mod_roster.erl: Fixed "from" attribute in roster pushes
+       * src/mod_roster_odbc.erl: Likewise
+
 2008-02-28  Badlop  <badlop@process-one.net>
 
        * src/ejabberd_app.erl (prep_stop): Stop modules when stopping

diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 3ba6949a459cee3071a88a6e8eb68b4304069c2b..f33dd3613deab6686e4ee2b913a780322f819827 100644 (file)
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -497,7 +497,7 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) ->
                            ok;
                        true ->
                            push_item(User, Server,
-                                     jlib:make_jid("", Server, ""), Item)
+                                     jlib:make_jid(User, Server, ""), Item)
                    end,
                    true;
                none ->

diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 8248f1dd92943db0068e289934b883ff5acea094..bfec73b3346b88f23ba97453a1b416c70ba403a4 100644 (file)
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -558,7 +558,7 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) ->
                            ok;
                        true ->
                            push_item(User, Server,
-                                     jlib:make_jid("", Server, ""), Item)
+                                     jlib:make_jid(User, Server, ""), Item)
                    end,
                    true;
                none ->