From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Mon, 27 Jan 2020 16:05:31 +0000 (-0500)
Subject: dev/core#1319 obvious mistakes after testing
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0403f8a3d4cfc9cf9c34fdc4675259dd9ec0665b;p=civicrm-core.git

dev/core#1319 obvious mistakes after testing
---

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index e7fbb59201..16a86405a8 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -1040,7 +1040,7 @@ SELECT is_primary,
     $dao = CRM_Core_DAO::executeQuery($query, [1 => [$addressId, 'Integer']]);
 
     // legacy - for api backward compatibility
-    if (!isset($params['add_relationship'] && isset($params['update_current_employer']))) {
+    if (!isset($params['add_relationship']) && isset($params['update_current_employer'])) {
       // warning
       CRM_Core_Error::deprecatedFunctionWarning('update_current_employer is deprecated, use add_relationship instead');
       $params['add_relationship'] = $params['update_current_employer'];
diff --git a/templates/CRM/Contact/Form/ShareAddress.tpl b/templates/CRM/Contact/Form/ShareAddress.tpl
index 6a5b6f9872..4d55db6f94 100644
--- a/templates/CRM/Contact/Form/ShareAddress.tpl
+++ b/templates/CRM/Contact/Form/ShareAddress.tpl
@@ -30,7 +30,7 @@
     <div id="shared-address-{$blockId}" class="form-layout-compressed">
       {$form.address.$blockId.master_contact_id.label}
       {$form.address.$blockId.master_contact_id.html}
-      <div class="shared-address-create-relationship" style="display: none;">
+      <div class="shared-address-add-relationship" style="display: none;">
         {$form.address.$blockId.add_relationship.html}
         {$form.address.$blockId.add_relationship.label}
         <div class="employer">{help id="id-sharedAddress-updateRelationships" file="CRM/Contact/Form/Contact"}</div>