From f5f31fc070588c2075dd13a0fbabe8117e3aad76 Mon Sep 17 00:00:00 2001
From: "mkanat%kerio.com" <>
Date: Tue, 5 Apr 2005 04:52:03 +0000
Subject: Bug 286235: Implicit joins should be replaced by explicit joins -
 installment A Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=joel, a=myk

---
 editgroups.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'editgroups.cgi')

diff --git a/editgroups.cgi b/editgroups.cgi
index 88099b543..87419a9cc 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -68,7 +68,7 @@ sub RederiveRegexp ($$)
                                  AND grant_type = ? and isbless = 0");
     $sth->execute();
     while (my ($uid, $login) = $sth->fetchrow_array()) {
-        my $present = $dbh->selectrow_array($sthqry, undef,
+        my $present = $dbh->selectrow_array($sthqry, undef,
                                             $uid, $gid, GRANT_REGEXP);
         if (($regexp =~ /\S+/) && ($login =~ m/$regexp/i))
         {
@@ -494,9 +494,10 @@ if (($action eq 'remove_all_regexp') || ($action eq 'remove_all')) {
     $dbh->bz_lock_tables('groups WRITE', 'profiles READ',
                          'user_group_map WRITE');
     $sth = $dbh->prepare("SELECT user_group_map.user_id, profiles.login_name
-                             FROM user_group_map, profiles
-                             WHERE user_group_map.user_id = profiles.userid
-                             AND user_group_map.group_id = ?
+                            FROM user_group_map
+                      INNER JOIN profiles
+                              ON user_group_map.user_id = profiles.userid
+                           WHERE user_group_map.group_id = ?
                              AND grant_type = ?
                              AND isbless = 0");
     $sth->execute($gid, GRANT_DIRECT);
-- 
cgit v1.2.3-24-g4f1b