aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2012-07-17 23:35:16 +1000
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2012-07-17 23:35:16 +1000
commit0cc920579c7c2472834710a98cfea1897b08ea2a (patch)
treee38b61657a14254fb5f6aba279f3a1ddc089c3f1
parentReduce size of XML stream state (diff)
Fix regression introduced in odbc/mnesia merge
Diffstat (limited to '')
-rw-r--r--src/mod_roster.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 65d5c0965..329a23796 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -970,12 +970,12 @@ update_roster_t(LUser, LServer, LJID, Item) ->
update_roster_t(_LUser, _LServer,_LJID, Item, mnesia) ->
mnesia:write(Item);
-update_roster_t(LUser, _LServer, LJID, Item, odbc) ->
+update_roster_t(LUser, LServer, LJID, Item, odbc) ->
Username = ejabberd_odbc:escape(LUser),
SJID = ejabberd_odbc:escape(jlib:jid_to_string(LJID)),
ItemVals = record_to_string(Item),
ItemGroups = groups_to_string(Item),
- odbc_queries:update_roster_sql(Username, SJID, ItemVals, ItemGroups).
+ odbc_queries:update_roster(LServer, Username, SJID, ItemVals, ItemGroups).
del_roster_t(LUser, LServer, LJID) ->
DBType = gen_mod:db_type(LServer, ?MODULE),
@@ -983,10 +983,10 @@ del_roster_t(LUser, LServer, LJID) ->
del_roster_t(LUser, LServer, LJID, mnesia) ->
mnesia:delete({roster, {LUser, LServer, LJID}});
-del_roster_t(LUser, _LServer, LJID, odbc) ->
+del_roster_t(LUser, LServer, LJID, odbc) ->
Username = ejabberd_odbc:escape(LUser),
SJID = ejabberd_odbc:escape(jlib:jid_to_string(LJID)),
- odbc_queries:del_roster_sql(Username, SJID).
+ odbc_queries:del_roster(LServer, Username, SJID).
process_item_set_t(LUser, LServer, {xmlelement, _Name, Attrs, Els}) ->
JID1 = jlib:string_to_jid(xml:get_attr_s("jid", Attrs)),