Peter M. Groen / knowledgetree

Commit 50e3f25dc2193be5774faca836e8206ccdb4733a

Authored by Brad Shuttleworth
1 parent 47fad449

fix for KTS-1242: error using group triggers. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5783 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
plugins/ktcore/KTWorkflowTriggers.inc.php
  View file @50e3f25
@@ -29,6 +29,8 @@ require_once(KT_LIB_DIR . "/workflow/workflowtrigger.inc.php"); @@ -29,6 +29,8 @@ require_once(KT_LIB_DIR . "/workflow/workflowtrigger.inc.php");
29 require_once(KT_LIB_DIR . "/permissions/permission.inc.php"); 29 require_once(KT_LIB_DIR . "/permissions/permission.inc.php");
30 require_once(KT_LIB_DIR . "/permissions/permissionutil.inc.php"); 30 require_once(KT_LIB_DIR . "/permissions/permissionutil.inc.php");
31 31
  32 +require_once(KT_LIB_DIR . "/groups/GroupUtil.php");
  33 +
32 class PermissionGuardTrigger extends KTWorkflowTrigger { 34 class PermissionGuardTrigger extends KTWorkflowTrigger {
33 var $sNamespace = 'ktcore.workflowtriggers.permissionguard'; 35 var $sNamespace = 'ktcore.workflowtriggers.permissionguard';
34 var $sFriendlyName; 36 var $sFriendlyName;
@@ -271,8 +273,8 @@ class GroupGuardTrigger extends KTWorkflowTrigger { @@ -271,8 +273,8 @@ class GroupGuardTrigger extends KTWorkflowTrigger {
271 if (PEAR::isError($oGroup)) { 273 if (PEAR::isError($oGroup)) {
272 return true; // fail safe for cases where the role is deleted. 274 return true; // fail safe for cases where the role is deleted.
273 } 275 }
274 - $res = KTGroupUtil::getMembershipReason($oUser, $oGroup);  
275 - if (PEAR::isError($res) || is_empty($res)) { // broken setup, or no reason 276 + $res = GroupUtil::getMembershipReason($oUser, $oGroup);
  277 + if (PEAR::isError($res) || empty($res)) { // broken setup, or no reason
276 return false; 278 return false;
277 } else { 279 } else {
278 return true; 280 return true;