From 0b256244c554bd7490392b2d711c92d46a736723 Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Thu, 6 Mar 2014 18:42:30 +0530 Subject: [PATCH] include join with soft credit by default, when softcredit search is active --- CRM/Contribute/BAO/Query.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index db981c061c..252d53bdda 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -665,6 +665,7 @@ class CRM_Contribute_BAO_Query { // switch the from table if its only soft credit search $from = " $side JOIN contribution_search_scredit_combined ON contribution_search_scredit_combined.contact_id = contact_a.id "; $from .= " $side JOIN civicrm_contribution ON civicrm_contribution.id = contribution_search_scredit_combined.id "; + $from .= " $side JOIN civicrm_contribution_soft ON civicrm_contribution_soft.id = contribution_search_scredit_combined.scredit_id"; } break; @@ -739,9 +740,7 @@ class CRM_Contribute_BAO_Query { break; case 'civicrm_contribution_soft': - if (in_array(self::$_contribOrSoftCredit, array("only_scredits", "both_related", "both"))) { - $from = " $side JOIN civicrm_contribution_soft ON civicrm_contribution_soft.id = contribution_search_scredit_combined.scredit_id"; - } else { + if (!in_array(self::$_contribOrSoftCredit, array("only_scredits", "both_related", "both"))) { $from = " $side JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id = civicrm_contribution.id"; } break; -- 2.25.1