From f1f2780003aa5b20e9fcd3fbd836e042bd2eb23d Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 11 Jul 2014 15:49:00 -0700
Subject: [PATCH] CRM-14961 - Fix (mostly) for display on Merge screen. Still
 need to fix postProcess and convert contact_type.name to label.

----------------------------------------
* CRM-14961:
  https://issues.civicrm.org/jira/browse/CRM-14961
---
 CRM/Contact/Form/Merge.php           |  4 ++--
 templates/CRM/Contact/Form/Merge.tpl | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index d818628bc1..75ae4ef10a 100644
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -199,12 +199,12 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
     $this->assign('contact_type', $main['contact_type']);
     if (!empty($main['contact_sub_type'])) {
       $this->assign('main_contact_subtype',
-        CRM_Utils_Array::value('contact_sub_type', $subtypes[$main['contact_sub_type'][0]])
+        CRM_Utils_Array::value($main['contact_sub_type'][0], $subtypes)
       );
     }
     if (!empty($other['contact_sub_type'])) {
       $this->assign('other_contact_subtype',
-        CRM_Utils_Array::value('contact_sub_type', $subtypes[$other['contact_sub_type'][0]])
+        CRM_Utils_Array::value($other['contact_sub_type'][0], $subtypes)
       );
     }
     $this->assign('main_name', $main['display_name']);
diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index e5fd182fb9..2858410663 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -41,19 +41,21 @@
 <table>
   <tr class="columnheader">
     <th>&nbsp;</th>
-    <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$other_cid"}">{$other_name}&nbsp;<em>{$other_contact_subtype}</em></a> ({ts}duplicate{/ts})</th>
+    <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$other_cid"}">{$other_name}</a> ({ts}duplicate{/ts})</th>
     <th>{ts}Mark All{/ts}<br />=={$form.toggleSelect.html} ==&gt;</th>
-    <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$main_cid"}">{$main_name}&nbsp;<em>{$main_contact_subtype}</em></a></th>
+    <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$main_cid"}">{$main_name}</a></th>
   </tr>
   {foreach from=$rows item=row key=field}
      <tr class="{cycle values="odd-row,even-row"}">
         <td>{$row.title}</td>
         <td>
-           {if !is_array($row.other)}
-               {$row.other}
-           {else}
-               {$row.other.fileName}
-           {/if}
+          {if !is_array($row.other)}
+            {$row.other}
+          {elseif $row.other.fileName}
+            {$row.other.fileName}
+          {else}
+            {', '|implode:$row.other}
+          {/if}
         </td>
         <td style='white-space: nowrap'>{if $form.$field}=={$form.$field.html}==&gt;{/if}</td>
         <td>
@@ -100,8 +102,10 @@
             <span id="main_{$blockName}_{$blockId}">
               {if !is_array($row.main)}
                 {$row.main}
-              {else}
+              {elseif $row.main.fileName}
                 {$row.main.fileName}
+              {else}
+                {', '|implode:$row.main}
               {/if}
             </span>
         </td>
-- 
2.25.1