aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/groupcp.php
diff options
context:
space:
mode:
authornatec <natec@users.sourceforge.net>2001-10-10 18:06:28 +0000
committernatec <natec@users.sourceforge.net>2001-10-10 18:06:28 +0000
commitd37f5611fb338076b3a8b7c6e09377d068d4b27e (patch)
tree322d5cfdca12d9b9cac530c0a992f95b8e6e69d3 /phpBB/groupcp.php
parent61288e89d9da55e07c5c650a1b38d7bf2b62edd2 (diff)
downloadforums-d37f5611fb338076b3a8b7c6e09377d068d4b27e.tar
forums-d37f5611fb338076b3a8b7c6e09377d068d4b27e.tar.gz
forums-d37f5611fb338076b3a8b7c6e09377d068d4b27e.tar.bz2
forums-d37f5611fb338076b3a8b7c6e09377d068d4b27e.tar.xz
forums-d37f5611fb338076b3a8b7c6e09377d068d4b27e.zip
Fixed bug 462914, and fixed totally fux0red groups admin panel.
git-svn-id: file:///svn/phpbb/trunk@1158 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/groupcp.php')
-rw-r--r--phpBB/groupcp.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 8aa8c5ac16..fd8a0d4491 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -610,9 +610,10 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR
// We've displayed the members who belong to the group, now we do that pending memebers... There's probably a better way of doing this..
$sql = "SELECT u.username, u.user_id, u.user_viewemail, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_msnm
FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u
- WHERE g.group_moderator = " . $userdata['user_id'] . "
- AND ug.group_id = g.group_id
+ WHERE ug.group_id = $group_id
+ AND g.group_id = ug.group_id
AND ug.user_pending = 1
+ AND g.group_moderator = " . $userdata['user_id'] . "
AND u.user_id = ug.user_id
ORDER BY u.user_regdate";
if(!$result = $db->sql_query($sql))
@@ -624,7 +625,7 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR
$modgroup_pending_list = $db->sql_fetchrowset($result);
}
//
- // Users pending in groups moderated by this user
+ // Users pending in ONLY THIS GROUP (which is moderated by this user)
//
if($modgroup_pending_count)
{