diff --git a/Model/Acl/AclClass.php b/Model/Acl/AclClass.php index 174ef8f..90653e8 100644 --- a/Model/Acl/AclClass.php +++ b/Model/Acl/AclClass.php @@ -36,7 +36,7 @@ class AclClass extends BaseAclClass ; if ($obj->isNew()) { - $obj->save(); + $obj->save($con); } return $obj; diff --git a/Model/Acl/ObjectIdentityQuery.php b/Model/Acl/ObjectIdentityQuery.php index 223eb97..71fec51 100644 --- a/Model/Acl/ObjectIdentityQuery.php +++ b/Model/Acl/ObjectIdentityQuery.php @@ -25,16 +25,17 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * Filter by an ObjectIdentity object belonging to the given ACL related ObjectIdentity. * * @param ObjectIdentityInterface $objectIdentity + * @param PropelPDO $con * * @return ObjectIdentityQuery $this */ - public function filterByAclObjectIdentity(ObjectIdentityInterface $objectIdentity) + public function filterByAclObjectIdentity(ObjectIdentityInterface $objectIdentity, PropelPDO $con = null) { /* * Not using a JOIN here, because the filter may be applied on 'findOneOrCreate', * which is currently (Propel 1.6.4-dev) not working. */ - $aclClass = AclClass::fromAclObjectIdentity($objectIdentity); + $aclClass = AclClass::fromAclObjectIdentity($objectIdentity, $con); $this ->filterByClassId($aclClass->getId()) ->filterByIdentifier($objectIdentity->getIdentifier()) @@ -54,7 +55,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery public function findOneByAclObjectIdentity(ObjectIdentityInterface $objectIdentity, PropelPDO $con = null) { return $this - ->filterByAclObjectIdentity($objectIdentity) + ->filterByAclObjectIdentity($objectIdentity, $con) ->findOne($con) ; } diff --git a/Model/Acl/SecurityIdentity.php b/Model/Acl/SecurityIdentity.php index d6b89c8..aa30ef3 100644 --- a/Model/Acl/SecurityIdentity.php +++ b/Model/Acl/SecurityIdentity.php @@ -74,7 +74,7 @@ class SecurityIdentity extends BaseSecurityIdentity ; if ($obj->isNew()) { - $obj->save(); + $obj->save($con); } return $obj; diff --git a/Security/Acl/Domain/MutableAcl.php b/Security/Acl/Domain/MutableAcl.php index e1bf97d..f3bb0e6 100644 --- a/Security/Acl/Domain/MutableAcl.php +++ b/Security/Acl/Domain/MutableAcl.php @@ -84,7 +84,7 @@ class MutableAcl extends Acl implements MutableAclInterface $this->entries = $entries; $this->modelObjectIdentity = ObjectIdentityQuery::create() - ->filterByAclObjectIdentity($objectIdentity) + ->filterByAclObjectIdentity($objectIdentity, $con) ->findOneOrCreate($con) ; diff --git a/Security/Acl/MutableAclProvider.php b/Security/Acl/MutableAclProvider.php index 9b25d90..4089c31 100644 --- a/Security/Acl/MutableAclProvider.php +++ b/Security/Acl/MutableAclProvider.php @@ -80,7 +80,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf } $objIdentity = ObjectIdentityQuery::create() - ->filterByAclObjectIdentity($objectIdentity) + ->filterByAclObjectIdentity($objectIdentity, $this->connection) ->findOneOrCreate($this->connection) ;