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

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index adf30b59070d891bb64808110f9b2cad35d9291a..5c99185663350a119f030b2e63059379d8c6d08a 100644 (file)
--- 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;
   }