Merge pull request #23155 from eileenmcnaughton/ret2

[civicrm-core.git] / CRM / Financial / Page / FinancialType.php

diff --git a/CRM/Financial/Page/FinancialType.php b/CRM/Financial/Page/FinancialType.php
index 7a1480d52472452a1a8771d43276f04bbc1878f3..5c9f2d4c64c1ebadc1ed0b0efcf361cf391c560a 100644 (file)
--- a/CRM/Financial/Page/FinancialType.php
+++ b/CRM/Financial/Page/FinancialType.php
@@ -84,12 +84,6 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic {
    * Browse all financial types.
    */
   public function browse() {
-    // Check permission for Financial Type when ACL-FT is enabled
-    if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()
-      && !CRM_Core_Permission::check('administer CiviCRM Financial Types')
-    ) {
-      CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
-    }
     // get all financial types sorted by weight
     $financialType = [];
     $dao = new CRM_Financial_DAO_FinancialType();
@@ -110,8 +104,7 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic {
 
       foreach ($financialAccountIds as $key => $values) {
         if (!empty($financialAccounts[$values['financial_account_id']])) {
-          $financialAccountId[$values['financial_account_id']] = CRM_Utils_Array::value(
-            $values['financial_account_id'], $financialAccounts);
+          $financialAccountId[$values['financial_account_id']] = $financialAccounts[$values['financial_account_id']] ?? NULL;
         }
       }