From: Jérôme Sautret <jerome.sautret@process-one.net>
Date: Tue, 7 Oct 2008 12:34:23 +0000 (+0000)
Subject: Merge commit 1612 from trunk:
X-Git-Tag: v2.0.3~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1effe2be49567f0fe661fa518b7bd629d30f31ac;p=ejabberd

Merge commit 1612 from trunk:
* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.

SVN Revision: 1613
---

diff --git a/ChangeLog b/ChangeLog
index 5a605f841..8b55a35aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 4439db30f..ad6c7043e 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -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")])].
-