Index: trunk/admin/users/user_groups.php
===================================================================
diff -u -r374 -r605
--- trunk/admin/users/user_groups.php	(.../user_groups.php)	(revision 374)
+++ trunk/admin/users/user_groups.php	(.../user_groups.php)	(revision 605)
@@ -151,20 +151,20 @@
 
 /* ----------------------------------------- Set the View Filter ---------------------------------------- */
 /* bit place holders for category view menu */
-$Bit_Pending=4;
+//$Bit_Pending=4;
 $Bit_Disabled=2;
 $Bit_Valid=1;
-$Bit_All = 7;
+$Bit_All = 3; //7;
 
 $FilterLabels = array();
 
 $FilterLabels[0] = admin_language("la_Text_Enabled");
 $FilterLabels[1] = admin_language("la_Text_Disabled");
-$FilterLabels[2] = admin_language("la_Text_Pending");
+//$FilterLabels[2] = admin_language("la_Text_Pending");
 
 /* determine current view menu settings */
 $GroupView = $objConfig->Get("Group_View");
-
+ $Status = Array();
 if(!is_numeric($GroupView))
 {   
    $GroupView = $Bit_All; //Set all bits ON
@@ -178,15 +178,15 @@
   if($GroupView & $Bit_Disabled)
       $Status[] = 0;
 
-  if($GroupView & $Bit_Pending)
-      $Status[] = 2;
+ /* if($GroupView & $Bit_Pending)
+      $Status[] = 2;*/
 
   if(count($Status)>0)
   {  
-    $GroupFilter = "Status IN (".implode(",",$Status).")";
+    $GroupFilter = "Enabled IN (".implode(",",$Status).")";
   }
   else
-      $GroupFilter = "Status = -1";
+      $GroupFilter = "Enabled = -1";
 }
 
 
@@ -207,8 +207,10 @@
 $orderBy = trim($objConfig->Get($SortFieldVar)." ".$order);
 if(strlen($orderBy))
     $orderBy = " ORDER BY ".$orderBy;
-$sql = "SELECT g.GroupId as GroupId, g.name as GroupName,g.name as name, count(u.PortalUserId) as UserCount FROM ".GetTablePrefix()."PortalGroup as g ";
-$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as u ON g.GroupId=u.GroupId WHERE $where GROUP BY g.name".$orderBy;
+$prefix = GetTablePrefix();
+$sql = "SELECT g.GroupId as GroupId, g.name as GroupName,g.name as name, count(u.PortalUserId) as UserCount
+		FROM ".$prefix."PortalGroup as g, ".$prefix.'UserGroup u
+		WHERE g.GroupId=u.GroupId AND '.$where.'GROUP BY g.name'.$orderBy;;
 
 if($objSession->HasSystemPermission("DEBUG.LIST"))
    echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";