From d9b043a1f45556f186934d9f191f2ffb8bfca6a9 Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Thu, 24 Mar 2016 14:35:39 +0000
Subject: [PATCH] CRM-18288: Fix mergeBlock JS for location types

---
 templates/CRM/Contact/Form/Merge.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index 96f23c585c..6e569d5e82 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -227,7 +227,7 @@
     // If the location was changed, lookup the type if it exists
     if (type == 'locTypeId') {
       locTypeId = element.value;
-      typeTypeId = CRM.$( 'select#type_' + blockname + '_' + blockId + '_typeTypeId' ).val();
+      typeTypeId = CRM.$( 'select#location_' + blockname + '_' + blockId + '_typeTypeId' ).val();
     }
 
     // Otherwise the type was changed, lookup the location if it exists
-- 
2.25.1