diff options
author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
---|---|---|
committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
commit | 95265dd3ad8e149d94d08e1a73970fb0bbf55b49 (patch) | |
tree | a00a134cf0148a121ea505809cef0d9d49799652 /src/mod_vcard.erl | |
parent | Make Riak working on R18 (diff) |
Move JID related functions to jid.erl (#847)
Diffstat (limited to 'src/mod_vcard.erl')
-rw-r--r-- | src/mod_vcard.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index ed6bff11..f82a0625 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -261,7 +261,7 @@ set_vcard(User, LServer, VCARD) -> <<"">> -> EMail2; _ -> EMail1 end, - LUser = jlib:nodeprep(User), + LUser = jid:nodeprep(User), LFN = string2lower(FN), LFamily = string2lower(Family), LGiven = string2lower(Given), @@ -404,7 +404,7 @@ string2lower(String) -> [{xmlcdata, <<(translate:translate(Lang, <<"Search users in ">>))/binary, - (jlib:jid_to_string(JID))/binary>>}]}, + (jid:to_string(JID))/binary>>}]}, #xmlel{name = <<"instructions">>, attrs = [], children = [{xmlcdata, @@ -607,7 +607,7 @@ search_result(Lang, JID, ServerHost, Data) -> [{xmlcdata, <<(translate:translate(Lang, <<"Search Results for ">>))/binary, - (jlib:jid_to_string(JID))/binary>>}]}, + (jid:to_string(JID))/binary>>}]}, #xmlel{name = <<"reported">>, attrs = [], children = [?TLFIELD(<<"text-single">>, <<"Jabber ID">>, @@ -916,8 +916,8 @@ reindex_vcards() -> mnesia:transaction(F). remove_user(User, Server) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), remove_user(LUser, LServer, gen_mod:db_type(LServer, ?MODULE)). |