Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

Fix a bug where the wrong module was called (jlib instead of exmpp_jid).

Browse Source 
PR:		EJABP-1

SVN Revision: 1624
This commit is contained in:
Jean-Sébastien Pédron 2008-10-10 14:41:26 +00:00
parent e3100110f0
commit 3adb238b31
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,6 +25,9 @@
* src/mod_vcard_odbc.erl (do_route/4): Replace jlib:iq_to_xml/1 by * src/mod_vcard_odbc.erl (do_route/4): Replace jlib:iq_to_xml/1 by
exmpp_iq:iq_to_xmlel/1. exmpp_iq:iq_to_xmlel/1.
* src/mod_roster_odbc.erl (user_roster_subscribe_jid/3): Fix a bug
where the wrong module was called (jlib instead of exmpp_jid).
2008-10-09 Jean-Sébastien Pédron <js.pedron@meetic-corp.com> 2008-10-09 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_c2s.erl: Fix handling of unauthenticated stanzas which * src/ejabberd_c2s.erl: Fix handling of unauthenticated stanzas which

4
src/mod_roster_odbc.erl
View File

@ -1009,7 +1009,7 @@ user_roster_parse_query(User, Server, Items, Query) ->
user_roster_subscribe_jid(User, Server, JID) -> user_roster_subscribe_jid(User, Server, JID) ->
out_subscription(User, Server, JID, subscribe), out_subscription(User, Server, JID, subscribe),
UJID = jlib:make_bare_jid(User, Server), UJID = exmpp_jid:make_bare_jid(User, Server),
ejabberd_router:route( ejabberd_router:route(
UJID, JID, exmpp_presence:subscribe()). UJID, JID, exmpp_presence:subscribe()).
@ -1032,7 +1032,7 @@ user_roster_item_parse_query(User, Server, Items, Query) ->
case lists:keysearch( case lists:keysearch(
"remove" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of "remove" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of
{value, _} -> {value, _} ->
UJID = jlib:make_bare_jid(User, Server), UJID = exmpp_jid:make_bare_jid(User, Server),
Attrs1 = exmpp_xml:set_attribute_in_list([], Attrs1 = exmpp_xml:set_attribute_in_list([],
'jid', exmpp_jid:jid_to_list(JID)), 'jid', exmpp_jid:jid_to_list(JID)),
Attrs2 = exmpp_xml:set_attribute_in_list(Attrs1, Attrs2 = exmpp_xml:set_attribute_in_list(Attrs1,