Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-05 18:23:45 +01:00
Code Releases Activity

Merge commit 1612 from trunk:

Browse Source 
* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.

SVN Revision: 1613
This commit is contained in:
Jérôme Sautret 2008-10-07 12:34:23 +00:00
parent 8a12914fd6
commit 1effe2be49
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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>
* doc/guide.html: Regenerated

7
src/mod_roster_odbc.erl
View File

@ -16,7 +16,7 @@
%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
%%% General Public License for more details.
%%%
%%%
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@ -680,7 +680,7 @@ set_items(User, Server, SubEl) ->
LServer = jlib:nameprep(Server),
catch odbc_queries:sql_transaction(
LServer,
lists:map(fun(El) ->
lists:flatmap(fun(El) ->
process_item_set_t(LUser, LServer, El)
end, Els)).
@ -913,7 +913,7 @@ groups_to_string(#roster{us = {User, _Server},
%% Empty groups do not need to be converted to string to be inserted in
%% the database
lists:foldl(fun([], Acc) -> Acc;
(Group, Acc) ->
(Group, Acc) ->
String = ["'", Username, "',"
"'", SJID, "',"
"'", ejabberd_odbc:escape(Group), "'"],
@ -1079,4 +1079,3 @@ us_to_list({User, Server}) ->
webadmin_user(Acc, _User, _Server, Lang) ->
Acc ++ [?XE("h3", [?ACT("roster/", "Roster")])].