commit

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index a038c31..613a77d 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -55,18 +55,19 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             }
         }
         
-        if(!empty($q['_with_membership_user'])){
-            $q['_with_membership_user'] = 1*$q['_with_membership_user'];
+        if(!empty($q['_is_in_group'])){
             $this->selectAdd("
-                COALESCE(
-                    (SELECT id from core_group_member
+                COALESCE((
+                    SELECT 
+                            COUNT(id) 
+                    FROM 
+                            core_group_member
                         WHERE 
-                            user_id = {$q['_with_membership_user']}
+                            user_id = {$q['_is_in_group']}
                         AND
                             group_id = {$this->tableName()}.id
-                        LIMIT 1
-                    ),0) as group_membership_user_id
-                    ");
+                    ), 0) AS is_in_group
+            ");
         }
         
         
@@ -104,7 +105,11 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jerr("missing group id");
 
             }
-             foreach(explode(',', $q['user_ids']) as $uid) {
+            
+            $user_ids = explode(',', $q['user_ids']);
+            
+            foreach($user_ids as $uid) {
+                
                 switch($q['_action']) {
                     case 'add':
                         $g->addMember($uid,$roo);
@@ -205,6 +210,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         $gm->user_id = is_object($person) ? $person->id : $person;
+        
         if (!$gm->count()) {
             $gm->insert();
         }