From 6bdabb0c3ba9b2a2755fffc27ed3795a9968556d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 07:13:42 +0000
Subject: [PATCH] Bugfixes coming from trunk (SVN #599): *
 src/mod_shared_roster.erl: Bugfix * src/mod_roster_odbc.erl: Bugfix

SVN Revision: 609
---
 ChangeLog                 | 6 ++++++
 src/mod_roster_odbc.erl   | 9 ++++-----
 src/mod_shared_roster.erl | 3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 212f96e31..f20eeaef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-05  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/mod_shared_roster.erl: Bugfix
+
+	* src/mod_roster_odbc.erl: Bugfix
+
 2006-09-03  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as a
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index cc94d10c6..9509cc68c 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -141,11 +141,10 @@ get_user_roster(Acc, {LUser, LServer}) ->
 				   R ->
 				       SJID = jlib:jid_to_string(R#roster.jid),
 				       Groups = lists:flatmap(
-						  fun({S, G}) ->
-							  case jlib:jid_tolower(S) of
-							      SJID -> [G];
-							      _ -> []
-							  end
+						  fun({S, G}) when S == SJID ->
+							  [G];
+						     (_) ->
+							  []
 						  end, JIDGroups),
 				       [R#roster{groups = Groups}]
 			       end
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index 6a438e673..a0160b959 100644
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -332,7 +332,8 @@ get_user_displayed_groups(US) ->
     [Group || Group <- DisplayedGroups1, is_group_enabled(Host, Group)].
 
 is_user_in_group(US, Group, Host) ->
-    case mnesia:match_object(#sr_user{us=US, group_host={Group, Host}}) of
+    case catch mnesia:dirty_match_object(
+		 #sr_user{us=US, group_host={Group, Host}}) of
 	[] -> false;
 	_  -> true
     end.