Merge pull request #23008 from eileenmcnaughton/temp_selected

[civicrm-core.git] / CRM / Contact / Page / View / Summary.php

diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php
index e6fe5b3af3fa1f25bcd70638e0f9e17d0261b8a8..d49f41c691d1da7982793cb254e1425e810d0f2a 100644 (file)
--- a/CRM/Contact/Page/View/Summary.php
+++ b/CRM/Contact/Page/View/Summary.php
@@ -150,7 +150,7 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
 
     $params['contact_id'] = $this->_contactId;
 
-    CRM_Contact_BAO_Contact::getValues($params, $defaults);
+    CRM_Contact_BAO_Contact::getValues(array_merge(['id' => $this->_contactId], $params), $defaults);
     $defaults['im'] = CRM_Core_BAO_IM::getValues(['contact_id' => $params['contact_id']]);
     $defaults['email'] = CRM_Core_BAO_Email::getValues(['contact_id' => $params['contact_id']]);
     $defaults['openid'] = CRM_Core_BAO_OpenID::getValues(['contact_id' => $params['contact_id']]);
@@ -158,7 +158,7 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
     $defaults['address'] = CRM_Core_BAO_Address::getValues(['contact_id' => $params['contact_id']], TRUE);
     CRM_Core_BAO_Website::getValues($params, $defaults);
     // Copy employer fields to the current_employer keys.
-    if (($defaults['contact_type'] === 'Individual') && $defaults['employer_id'] && $defaults['organization_name']) {
+    if (($defaults['contact_type'] === 'Individual') && !empty($defaults['employer_id']) && !empty($defaults['organization_name'])) {
       $defaults['current_employer'] = $defaults['organization_name'];
       $defaults['current_employer_id'] = $defaults['employer_id'];
     }