dev/core#1319 obvious mistakes after testing

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index e7fbb5920162d60e43770adfd0364490e446a234..16a86405a8438b23d11c2930d3f893ef10e99719 100644 (file)
--- 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 6a5b6f9872d7dc0f779d39777c1c2b5314a47a68..4d55db6f9441acfecee83e3ceb54787761a409a4 100644 (file)
--- 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>