X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=a18c3da94a661b3b24e7127f94cd58a2f57c74ca;hb=e2f5b2ff1de0532f196c40a5edf6220220e5892a;hp=a7feecde6b6c55dcfd1f8fd47118bc4e03bd3fa3;hpb=49f4ce81e1816585d1ae52f75c649957d2bad761;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index a7feecde..a18c3da9 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -61,20 +61,31 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         
         $this->selectAdd("
            (
-            SELECT 
-                count(user_id) 
-            FROM 
-                core_group_member
-            WHERE 
-                {$this->tableName()}.id = core_group_member.group_id
+            SELECT COUNT(${cgm}.user_id) 
+                FROM 
+                    {$cgm}
+                LEFT JOIN
+                    {$cp}
+                ON
+                    ${cp}.id = {$cgm}.user_id
+                WHERE
+                    ${cgm}.group_id = {$this->tableName()}.id
                 AND
-                    core_group_member.user_id = core_person.id
-                
-            ) 
-            AS group_member_count            
+                    ${cp}.active = 1
+                ) AS group_member_count            
         ");
- 
-
+        
+        /*WHERE 
+            {$this->tableName()}.id = core_group_member.group_id
+            AND
+                core_group_member.user_id = core_person.id
+            AND
+                core_person.active = 1    
+        )*/ 
+        
+//        $this->whereAdd("{$this->tableName()}.id = core_group_member.group_id");
+//        $this->whereAdd("core_group_member.user_id = core_person.id");
+//        $this->whereAdd("core_person.active = 1");
      
     
         /*$cgmDBObj->joinAdd($cpObj);