projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
DataObjects/Core_group.php
[Pman.Core]
/
DataObjects
/
Core_group.php
diff --git
a/DataObjects/Core_group.php
b/DataObjects/Core_group.php
index
6658918
..
f4dead4
100644
(file)
--- a/
DataObjects/Core_group.php
+++ b/
DataObjects/Core_group.php
@@
-66,8
+66,9
@@
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
+ {$cgm->tableName()}.user_id = {$cp->tableName()}.id
AND
{$cp}.active = 1
)