Merge - Fix more leftover references to 'location'

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index 0699aa4652f0ae81f1d8a9fc372bf679394602e7..30c63446848ab2be88ad2d14f74d33fa36528524 100644 (file)
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -229,12 +229,12 @@
     // If the location was changed, lookup the type if it exists
     if (type == 'locTypeId') {
       locTypeId = element.value;
-      typeTypeId = CRM.$( 'select#location_' + blockname + '_' + blockId + '_typeTypeId' ).val();
+      typeTypeId = CRM.$( 'select#location_blocks_' + blockname + '_' + blockId + '_typeTypeId' ).val();
     }
 
     // Otherwise the type was changed, lookup the location if it exists
     else {
-      locTypeId = CRM.$( 'select#location_' + blockname + '_' + blockId + '_locTypeId' ).val();
+      locTypeId = CRM.$( 'select#location_blocks_' + blockname + '_' + blockId + '_locTypeId' ).val();
       typeTypeId = element.value;
     }