From bcc1eb1c0ec6edc8857dac2837a4c9aa0110bbea Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 19 Aug 2005 10:52:06 +0000
Subject: - only bugfixes - use usergroup function to activate users at admin
 index

git-svn-id: file:///svn/phpbb/trunk@5200 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/admin_groups.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/admin_groups.php')

diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php
index c758f4978d..4c0e546670 100644
--- a/phpBB/adm/admin_groups.php
+++ b/phpBB/adm/admin_groups.php
@@ -604,7 +604,7 @@ function swatch()
 					FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug 
 					WHERE ug.group_id = $group_id 
 						AND u.user_id = ug.user_id 
-					ORDER BY ug.group_leader DESC, ug.user_pending DESC, u.username 
+					ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username 
 					LIMIT $start, " . $config['topics_per_page'];
 				$result = $db->sql_query($sql);
 
@@ -674,26 +674,26 @@ function swatch()
 		<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_APPROVED']; ?></b></td>
 	</tr>
 <?php
+
 				if (sizeof($group_data['member']))
 				{
-					$pending = $group_data['member'][0]['user_pending'];
-
 					$row_class = '';
+					$pending = false;
+
 					foreach ($group_data['member'] as $row)
 					{
-						if ($pending)
-						{
+						$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
 
+						if ($row['user_pending'] && !$pending)
+						{
 ?>
 	<tr>
 		<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_PENDING']; ?></b></td>
 	</tr>
 <?php
-
+							$pending = true;
 						}
 
-						$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
 ?>
 	<tr class="<?php echo $row_class; ?>">
 		<td><a href="<?php echo "admin_users.$phpEx$SID&amp;mode=edit&amp;u=" . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td>
-- 
cgit v1.2.1