From 9e6914114a17d5b1ca92ae4aa1f9796d1ba66df8 Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net" <>
Date: Wed, 11 Aug 2004 21:00:33 +0000
Subject: Bug 244239: Add group-based pronouns to query r=erik,justdave
 a=justdave

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

(limited to 'editgroups.cgi')

diff --git a/editgroups.cgi b/editgroups.cgi
index 981fec48a..b3b6135e4 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -153,7 +153,7 @@ if ($action eq 'changeform') {
              " ON C.member_id = groups.id" .
              " AND C.grantor_id = $group_id" .
              " AND C.grant_type = " . GROUP_VISIBLE .
-             " WHERE groups.id != $group_id ORDER by name");
+             " ORDER by name");
 
     while (MoreSQLData()) {
         my ($grpid, $grpnam, $grpdesc, $grpmember, $blessmember, $membercansee) 
@@ -531,7 +531,7 @@ sub doGroupChanges {
             $b =~ /^oldgrp-(\d+)$/;
             my $v = $1;
             my $grp = $cgi->param("grp-$v") || 0;
-            if ($cgi->param("oldgrp-$v") != $grp) {
+            if (($cgi->param("oldgrp-$v") != $grp) && ($v != $gid)) {
                 $chgs = 1;
                 if ($grp != 0) {
                     SendSQL("INSERT INTO group_group_map 
-- 
cgit v1.2.3-24-g4f1b