From e6a830347fa47f66f5c98419aa1b606f9c0d6f35 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 14:56:52 -0800 Subject: [PATCH] INFRA-132 - CRM/ACL - Misc --- CRM/ACL/API.php | 3 ++- CRM/ACL/BAO/ACL.php | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CRM/ACL/API.php b/CRM/ACL/API.php index 0d3c6925ee..03b700bbd9 100644 --- a/CRM/ACL/API.php +++ b/CRM/ACL/API.php @@ -90,7 +90,8 @@ class CRM_ACL_API { * * @return string the group where clause for this user */ - public static function whereClause($type, + public static function whereClause( + $type, &$tables, &$whereTables, $contactID = NULL, diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php index 378579bc22..ff64129ec5 100644 --- a/CRM/ACL/BAO/ACL.php +++ b/CRM/ACL/BAO/ACL.php @@ -108,7 +108,8 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { * @return string - The WHERE clause, or 0 on failure * @static */ - public static function permissionClause(&$tables, $operation, + public static function permissionClause( + &$tables, $operation, $object_table = NULL, $object_id = NULL, $acl_id = NULL, $acl_role = FALSE ) { @@ -851,7 +852,8 @@ SELECT g.* * * @return array */ - public static function group($type, + public static function group( + $type, $contactID = NULL, $tableName = 'civicrm_saved_search', $allGroups = NULL, -- 2.25.1