From f46990883c7f8d5011c9d905468a582d9319d8fc Mon Sep 17 00:00:00 2001 From: Jaap Jansma Date: Thu, 23 Mar 2017 15:32:44 +0100 Subject: [PATCH] Fixed CRM-20333: search and contacts menu visible even when a contact does not has access to any contacts. --- CRM/Core/BAO/Navigation.php | 11 ----------- templates/CRM/common/navigation.js.tpl | 2 -- 2 files changed, 13 deletions(-) diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php index a4ae608bbdb9..d0105669b3b3 100644 --- a/CRM/Core/BAO/Navigation.php +++ b/CRM/Core/BAO/Navigation.php @@ -477,17 +477,6 @@ public static function getMenuName(&$value, &$skipMenuItems) { return FALSE; } - //we need to check core view/edit or supported acls. - if (in_array($menuName, array( - 'Search...', - 'Contacts', - ))) { - if (!CRM_Core_Permission::giveMeAllACLs()) { - $skipMenuItems[] = $navID; - return FALSE; - } - } - $config = CRM_Core_Config::singleton(); $makeLink = FALSE; diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl index 7f5aff91f95f..d6c6912f50ab 100644 --- a/templates/CRM/common/navigation.js.tpl +++ b/templates/CRM/common/navigation.js.tpl @@ -25,7 +25,6 @@ *}// http://civicrm.org/licensing {capture assign=menuMarkup}{strip} - {/if} {$navigation} {/strip}{/capture}//