From 7067c4fa2d2f3d68a6c4f6f27918c7f5b72a2843 Mon Sep 17 00:00:00 2001 From: nbm Date: Wed, 16 Nov 2005 12:16:19 +0000 Subject: [PATCH] If there's a PEAR Error detecting the dynamic conditions, act as if there aren't any, as there's nothing we can do at this point about it. --- lib/permissions/permissionutil.inc.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/permissions/permissionutil.inc.php b/lib/permissions/permissionutil.inc.php index e7eb689..0a6bab4 100644 --- a/lib/permissions/permissionutil.inc.php +++ b/lib/permissions/permissionutil.inc.php @@ -191,15 +191,17 @@ class KTPermissionUtil { if (!is_a($oFolderOrDocument, 'Folder')) { $aDynamicConditions = KTPermissionDynamicCondition::getByPermissionObject($oPO); - foreach ($aDynamicConditions as $oDynamicCondition) { - $iConditionId = $oDynamicCondition->getConditionId(); - if (KTSearchUtil::testConditionOnDocument($iConditionId, $oFolderOrDocument)) { - $iGroupId = $oDynamicCondition->getGroupId(); - $aPermissionIds = $oDynamicCondition->getAssignment(); - foreach ($aPermissionIds as $iPermissionId) { - $aCurrentAllowed = KTUtil::arrayGet($aMapPermAllowed, $iPermissionId, array()); - $aCurrentAllowed["group"][] = $iGroupId; - $aMapPermAllowed[$iPermissionId] = $aCurrentAllowed; + if (!PEAR::isError($aDynamicConditions)) { + foreach ($aDynamicConditions as $oDynamicCondition) { + $iConditionId = $oDynamicCondition->getConditionId(); + if (KTSearchUtil::testConditionOnDocument($iConditionId, $oFolderOrDocument)) { + $iGroupId = $oDynamicCondition->getGroupId(); + $aPermissionIds = $oDynamicCondition->getAssignment(); + foreach ($aPermissionIds as $iPermissionId) { + $aCurrentAllowed = KTUtil::arrayGet($aMapPermAllowed, $iPermissionId, array()); + $aCurrentAllowed["group"][] = $iGroupId; + $aMapPermAllowed[$iPermissionId] = $aCurrentAllowed; + } } } } -- libgit2 0.21.4