Merge pull request #13158 from elisseck/dev/core/544

[civicrm-core.git] / CRM / Contact / BAO / Contact / Utils.php

diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
index 7a81cb029eb43c2228ae43e013be75ab61c3d663..a4aff68fa82c6ceb357bd16a45951982e1fdb50f 100644 (file)
--- a/CRM/Contact/BAO/Contact/Utils.php
+++ b/CRM/Contact/BAO/Contact/Utils.php
@@ -229,7 +229,7 @@ WHERE  id IN ( $idString )
 
     $check = self::generateChecksum($contactID, $inputTS, $inputLF);
 
-    if ($check != $inputCheck) {
+    if (!hash_equals($check, $inputCheck)) {
       return FALSE;
     }
 
@@ -825,7 +825,7 @@ INNER JOIN civicrm_contact contact_target ON ( contact_target.id = act.contact_i
     // Normal update process will automatically create new address with submitted values
 
     // 1. loop through entire submitted address array
-    $skipFields = array('is_primary', 'location_type_id', 'is_billing', 'master_id');
+    $skipFields = array('is_primary', 'location_type_id', 'is_billing', 'master_id', 'update_current_employer');
     foreach ($address as & $values) {
       // 2. check if "Use another contact's address" is checked, if not continue
       // Additionally, if master_id is set (address was shared), set master_id to empty value.
@@ -836,6 +836,9 @@ INNER JOIN civicrm_contact contact_target ON ( contact_target.id = act.contact_i
         continue;
       }
 
+      // Set update_current_employer checkbox value
+      $values['update_current_employer'] = !empty($values['update_current_employer']);
+
       // 3. get the address details for master_id
       $masterAddress = new CRM_Core_BAO_Address();
       $masterAddress->id = CRM_Utils_Array::value('master_id', $values);