aboutsummaryrefslogtreecommitdiffstats
path: root/editgroups.cgi
diff options
context:
space:
mode:
authormkanat%kerio.com <>2005-04-05 04:52:03 +0000
committermkanat%kerio.com <>2005-04-05 04:52:03 +0000
commitf5f31fc070588c2075dd13a0fbabe8117e3aad76 (patch)
tree4a3bb48995143c84fcb8f222b420814e1c6e8eaf /editgroups.cgi
parentd71d64d9372f1556cec96434179b4cb1f9668e92 (diff)
downloadbugs-f5f31fc070588c2075dd13a0fbabe8117e3aad76.tar
bugs-f5f31fc070588c2075dd13a0fbabe8117e3aad76.tar.gz
bugs-f5f31fc070588c2075dd13a0fbabe8117e3aad76.tar.bz2
bugs-f5f31fc070588c2075dd13a0fbabe8117e3aad76.tar.xz
bugs-f5f31fc070588c2075dd13a0fbabe8117e3aad76.zip
Bug 286235: Implicit joins should be replaced by explicit joins - installment A
Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=joel, a=myk
Diffstat (limited to 'editgroups.cgi')
-rwxr-xr-xeditgroups.cgi9
1 files changed, 5 insertions, 4 deletions
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);