From a8f5d4cd3d01057c4d1f1d74a25da84ce14800e5 Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Sat, 29 Oct 2005 20:14:39 +0000
Subject: * src/mod_roster_odbc.erl: Bugfix

SVN Revision: 428
---
 src/mod_roster_odbc.erl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 75b58e8b6..36d477d52 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -468,7 +468,18 @@ process_subscription(Direction, User, Server, JID1, Type) ->
 	       {selected, ["username", "jid", "nick", "subscription", "ask",
 			   "server", "subscribe", "type"],
 		[I]} ->
-		   raw_to_record(I);
+		   R = raw_to_record(I),
+		   Groups = case catch ejabberd_odbc:sql_query(
+					 LServer,
+					 ["select grp from rostergroups "
+					  "where username='", Username, "' "
+					  "and jid='", SJID, "'"]) of
+				{selected, ["grp"], JGrps} when is_list(JGrps) ->
+				    [JGrp || {JGrp} <- JGrps];
+				_ ->
+				    []
+			    end,
+		   R#roster{groups = Groups};
 	       _ ->
 		   #roster{user = LUser,
 			   jid = LJID}
-- 
cgit v1.2.3