DataObjects/Core_group.php

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 891912b..39da3c0 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -53,18 +53,11 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jok($core_group->memberCount());
             }
         }
-        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
+
+
         
-        $this->_join .= "
-            LEFT JOIN
-                core_group_member
-            ON
-                core_group.id = core_group_member.group_id
-            Left JOIN
-                core_person
-            ON
-                core_user_id = core_person.id
-        ";
+        $cp = DB_DataObject::Factory('core_person')->tableName();
+        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
         
         $this->selectAdd("
            (
@@ -73,16 +66,21 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             FROM 
                 {$cgm}
             WHERE 
-                {$this->tableName()}.id = {$cgm}.group_id
-            ) 
+                {$this->tableName()}.id = {$cgm->tableName()}.group_id
             AND
-                core_person.active = 1
+                {$cgm->tableName()}.user_id = {$cp->tableName()}.id
+            AND
+                {$cp->tableName()}.active = 1
+            ) 
             AS group_member_count            
         ");
-        
-        
-        
+ 
 
+     
+    
+        /*$cgmDBObj->joinAdd($cpObj);
+        $this->joinAdd($cgmDBObj);
+        DB_DataObject::debugLevel();*/
     }
 
     function toEventString() {