Merge pull request #22494 from eileenmcnaughton/fin

Remove handling for impossible array
civicrm · Jan 13, 2022 · 156c4c2 · 156c4c2
2 parents 4526b69 + 8489e9e
commit 156c4c2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -2038,7 +2038,7 @@ public function whereClauseSingle(&$values, $isForcePrimaryOnly = FALSE) {
    * @return string
    * @throws \CRM_Core_Exception
    */
-  public function whereClause($isForcePrimaryEmailOnly = NULL) {
+  public function whereClause($isForcePrimaryEmailOnly = NULL): string {
     $this->_where[0] = [];
     $this->_qill[0] = [];
 

diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php
@@ -356,33 +356,22 @@ public static function buildPermissionedClause(&$whereClauses, $component = NULL
     if (!self::isACLFinancialTypeStatus()) {
       return FALSE;
     }
-    if (is_array($whereClauses)) {
+    if ($component == 'contribution') {
       $types = self::getAllEnabledAvailableFinancialTypes();
-      if (empty($types)) {
-        $whereClauses[] = ' ' . $alias . '.financial_type_id IN (0)';
-      }
-      else {
-        $whereClauses[] = ' ' . $alias . '.financial_type_id IN (' . implode(',', array_keys($types)) . ')';
-      }
+      $column = "financial_type_id";
     }
-    else {
-      if ($component == 'contribution') {
-        $types = self::getAllEnabledAvailableFinancialTypes();
-        $column = "financial_type_id";
-      }
-      if ($component == 'membership') {
-        self::getAvailableMembershipTypes($types, CRM_Core_Action::VIEW);
-        $column = "membership_type_id";
-      }
-      if (!empty($whereClauses)) {
-        $whereClauses .= ' AND ';
-      }
-      if (empty($types)) {
-        $whereClauses .= " civicrm_{$component}.{$column} IN (0)";
-        return;
-      }
-      $whereClauses .= " civicrm_{$component}.{$column} IN (" . implode(',', array_keys($types)) . ")";
+    if ($component == 'membership') {
+      self::getAvailableMembershipTypes($types, CRM_Core_Action::VIEW);
+      $column = "membership_type_id";
+    }
+    if (!empty($whereClauses)) {
+      $whereClauses .= ' AND ';
+    }
+    if (empty($types)) {
+      $whereClauses .= " civicrm_{$component}.{$column} IN (0)";
+      return;
     }
+    $whereClauses .= " civicrm_{$component}.{$column} IN (" . implode(',', array_keys($types)) . ")";
   }
 
   /**