From ccd8e56fc9440000ee0dab27d916ec4a5b4011a3 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 6 Jun 2019 11:30:21 +1200 Subject: [PATCH] dev/core#1015 fix regression on exporting soft credits - more robust version This applies a full fix to a regression we fixed with a less robust fix due to test issues https://github.com/civicrm/civicrm-core/pull/13748/commits/7f59431188688d4697bff55738fe17996abe442f#diff-e54381bfdf51e31cab376c71ca0d66ffR2716 removed a space that was required when exporting soft credits. The fix makes the addition of a space in a more sensible way (doesn't rely on it being done correctly in dozens of places --- CRM/Contact/BAO/Query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index adf30b5907..5c99185663 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -2656,7 +2656,7 @@ class CRM_Contact_BAO_Query { continue; } - $from .= self::getEntitySpecificJoins($name, $mode, $side, $primaryLocation); + $from .= ' ' . trim(self::getEntitySpecificJoins($name, $mode, $side, $primaryLocation)) . ' '; } return $from; } -- 2.25.1