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

* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1213

diff --git a/ChangeLog b/ChangeLog
index 7209023eb8f61935cb27ac691a9f8417f4d111f7..bc78f2a4618b9315f2516be020756566b3c72fee 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 23dd9ee65d8dfc2f3061fe9eb161cb39d3a2da65..f1f59665a048823c1a16d24e4d6404f1fbb0283d 100644 (file)
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -459,7 +459,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 652569853251e3ee8351bb9a98deb9f6acd9c859..d38121560ed324249879ac48c9f0ed81c889d2de 100644 (file)
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -520,7 +520,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 ->