aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2005-11-22 18:43:06 +0000
committerAlexey Shchepin <alexey@process-one.net>2005-11-22 18:43:06 +0000
commit816d5474f805cdb6d937c1147e48e967b1db351f (patch)
tree2d22732c25db96d2f7cada147b511d4a13511cc8
parent* src/web/ejabberd_web_admin.erl: Fixed encoding of user names in (diff)
* src/mod_roster.erl: The "id" attribute of roster push packet was
missed (thanks to Maxim Ryazanov) * src/mod_roster_odbc.erl: Likewise SVN Revision: 442
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_roster.erl4
-rw-r--r--src/mod_roster_odbc.erl2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b33cbeb86..57c8e5449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-11-22 Alexey Shchepin <alexey@sevcom.net>
+ * src/mod_roster.erl: The "id" attribute of roster push packet was
+ missed (thanks to Maxim Ryazanov)
+ * src/mod_roster_odbc.erl: Likewise
+
* src/web/ejabberd_web_admin.erl: Fixed encoding of user names in
URLs
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 48e2c1e8b..84d02aa41 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -313,11 +313,12 @@ push_item(User, Server, From, Item) ->
push_item(User, Server, Resource, From, Item)
end, ejabberd_sm:get_user_resources(User, Server)).
-% TODO: don't push to those who not load roster
+% TODO: don't push to those who didn't load roster
-ifdef(PSI_ROSTER_WORKAROUND).
push_item(User, Server, Resource, _From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
+ id = "push",
sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]},
@@ -330,6 +331,7 @@ push_item(User, Server, Resource, _From, Item) ->
push_item(User, Server, Resource, From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
+ id = "push",
sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]},
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 66b065473..d94b13b32 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -385,6 +385,7 @@ push_item(User, Server, From, Item) ->
push_item(User, Server, Resource, _From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
+ id = "push",
sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]},
@@ -397,6 +398,7 @@ push_item(User, Server, Resource, _From, Item) ->
push_item(User, Resource, From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
+ id = "push",
sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]},