mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-19 14:03:03 +02:00
* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.
SVN Revision: 1612
This commit is contained in:
parent
10ab4e6782
commit
b65caa82fb
@ -1,3 +1,7 @@
|
|||||||
|
2008-10-07 Jerome Sautret <jerome.sautret@process-one.net>
|
||||||
|
|
||||||
|
* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.
|
||||||
|
|
||||||
2008-10-06 Badlop <badlop@process-one.net>
|
2008-10-06 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
* doc/guide.html: Regenerated
|
* doc/guide.html: Regenerated
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
|
%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
%%% General Public License for more details.
|
%%% General Public License for more details.
|
||||||
%%%
|
%%%
|
||||||
%%% You should have received a copy of the GNU General Public License
|
%%% You should have received a copy of the GNU General Public License
|
||||||
%%% along with this program; if not, write to the Free Software
|
%%% along with this program; if not, write to the Free Software
|
||||||
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
@ -642,7 +642,7 @@ set_items(User, Server, SubEl) ->
|
|||||||
LServer = jlib:nameprep(Server),
|
LServer = jlib:nameprep(Server),
|
||||||
catch odbc_queries:sql_transaction(
|
catch odbc_queries:sql_transaction(
|
||||||
LServer,
|
LServer,
|
||||||
lists:map(fun(El) ->
|
lists:flatmap(fun(El) ->
|
||||||
process_item_set_t(LUser, LServer, El)
|
process_item_set_t(LUser, LServer, El)
|
||||||
end, Els)).
|
end, Els)).
|
||||||
|
|
||||||
@ -875,7 +875,7 @@ groups_to_string(#roster{us = {User, _Server},
|
|||||||
%% Empty groups do not need to be converted to string to be inserted in
|
%% Empty groups do not need to be converted to string to be inserted in
|
||||||
%% the database
|
%% the database
|
||||||
lists:foldl(fun([], Acc) -> Acc;
|
lists:foldl(fun([], Acc) -> Acc;
|
||||||
(Group, Acc) ->
|
(Group, Acc) ->
|
||||||
String = ["'", Username, "',"
|
String = ["'", Username, "',"
|
||||||
"'", SJID, "',"
|
"'", SJID, "',"
|
||||||
"'", ejabberd_odbc:escape(Group), "'"],
|
"'", ejabberd_odbc:escape(Group), "'"],
|
||||||
@ -1041,4 +1041,3 @@ us_to_list({User, Server}) ->
|
|||||||
|
|
||||||
webadmin_user(Acc, _User, _Server, Lang) ->
|
webadmin_user(Acc, _User, _Server, Lang) ->
|
||||||
Acc ++ [?XE("h3", [?ACT("roster/", "Roster")])].
|
Acc ++ [?XE("h3", [?ACT("roster/", "Roster")])].
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user