diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-10-30 09:11:13 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-10-30 09:11:13 +0300 |
| commit | 3e5ab8082b4a98a97a4598982cd1f361f2041af4 (patch) | |
| tree | 5db0e0e11d960d020eeeda513ca2da2da5e9473d /src | |
| parent | Fix race condition in Redis/SQL supervisors startup (diff) | |
Revert "Escape 'family' field in SQL requests"
This reverts commit f51ba687e213cdc4136138cba39bb8bc022097ab.
Fixes #3072
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_vcard_sql.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl index 85f6aefd6..6b604161f 100644 --- a/src/mod_vcard_sql.erl +++ b/src/mod_vcard_sql.erl @@ -102,7 +102,7 @@ set_vcard(LUser, LServer, VCARD, "!server_host=%(LServer)s", "fn=%(FN)s", "lfn=%(LFN)s", - "\"family\"=%(Family)s", + "family=%(Family)s", "lfamily=%(LFamily)s", "given=%(Given)s", "lgiven=%(LGiven)s", @@ -136,7 +136,7 @@ search(LServer, Data, AllowReturnAll, MaxMatch) -> end, case catch ejabberd_sql:sql_query( LServer, - [<<"select username, fn, \"family\", given, " + [<<"select username, fn, family, given, " "middle, nickname, bday, ctry, " "locality, email, orgname, orgunit " "from vcard_search ">>, @@ -192,7 +192,7 @@ remove_user(LUser, LServer) -> " where lusername=%(LUser)s and %(LServer)H")) end). -export(_Server) -> +export(_Server) -> [{vcard, fun(Host, #vcard{us = {LUser, LServer}, vcard = VCARD}) when LServer == Host -> @@ -227,7 +227,7 @@ export(_Server) -> "server_host=%(LServer)s", "fn=%(FN)s", "lfn=%(LFN)s", - "\"family\"=%(Family)s", + "family=%(Family)s", "lfamily=%(LFamily)s", "given=%(Given)s", "lgiven=%(LGiven)s", |