From 911f19460de26edf82bdbe4af6db33a84233d7be Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 21 Aug 2015 08:22:08 -0400 Subject: [PATCH] Revert "CRM-16512 - Fix permission checks on self" This reverts commit 071a4d0ecfadb1c0d7b023259c817fecb38aebd1. Conflicts: CRM/ACL/API.php --- CRM/ACL/API.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CRM/ACL/API.php b/CRM/ACL/API.php index 9a93359013..10bdac50a3 100644 --- a/CRM/ACL/API.php +++ b/CRM/ACL/API.php @@ -118,20 +118,11 @@ class CRM_ACL_API { return $deleteClause; } - $user = CRM_Core_Session::getLoggedInContactID(); if ($contactID == NULL) { + $user = CRM_Core_Session::getLoggedInContactID(); $contactID = $user ? $user : 0; } - // Check if contact has permissions on self - if ($user && $contactID == $user) { - if (CRM_Core_Permission::check('edit my contact') || - ($type == self::VIEW && CRM_Core_Permission::check('view my contact')) - ) { - return ' ( 1 ) '; - } - } - return implode(' AND ', array( CRM_ACL_BAO_ACL::whereClause($type, -- 2.25.1