Merge pull request #22611 from yashodha/report_cleanup

report cleanup - no functional change
civicrm · Jan 24, 2022 · dfbd91c · dfbd91c
2 parents 1e5f06c + 9c6a892
commit dfbd91c
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php
@@ -414,11 +414,7 @@ public function from() {
 
     // Include Email Field.
     if ($this->_emailField_a) {
-      $this->_from .= "
-             LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
-                       ON ( {$this->_aliases['civicrm_contact']}.id =
-                            {$this->_aliases['civicrm_email']}.contact_id AND
-                            {$this->_aliases['civicrm_email']}.is_primary = 1 )";
+      $this->joinEmailFromContact();
     }
     if ($this->_emailField_b) {
       $this->_from .= "
@@ -429,11 +425,7 @@ public function from() {
     }
     // Include Phone Field.
     if ($this->_phoneField_a) {
-      $this->_from .= "
-             LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
-                       ON ( {$this->_aliases['civicrm_contact']}.id =
-                            {$this->_aliases['civicrm_phone']}.contact_id AND
-                            {$this->_aliases['civicrm_phone']}.is_primary = 1 )";
+      $this->joinPhoneFromContact();
     }
     if ($this->_phoneField_b) {
       $this->_from .= "