From: nielosz <nielosz@users.noreply.github.com>
Date: Tue, 28 Jun 2016 13:36:38 +0000 (+0200)
Subject: Fix messed display with multiple contacts in one col
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3bffea44d993dbf526e76a2b11e7870d9ff456bd;p=civicrm-core.git

Fix messed display with multiple contacts in one col
---

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 2c7b68e96b..2cb1893ebd 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2546,12 +2546,12 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n
               FALSE,
               $tcID
             );
-            $activity['target_contact_name'] .= $targetTypeImage . CRM_Utils_System::href($tcName,
-              'civicrm/contact/view', "reset=1&cid={$tcID}");
+            $targetLink = CRM_Utils_System::href($tcName, 'civicrm/contact/view', "reset=1&cid={$tcID}");
+            $activity['target_contact_name'] .= "<div>$targetTypeImage  $targetLink</div>";
           }
 
           if ($extraCount = $values['target_contact_counter'] - 1) {
-            $activity['target_contact_name'] .= ";<br />" . "(" . ts('%1 more', array(1 => $extraCount)) . ")";
+            $activity['target_contact_name'] .= "<div>" . "(" . ts('%1 more', array(1 => $extraCount)) . ")</div>";
           }
         }
         elseif (!$values['target_contact_name']) {
@@ -2572,11 +2572,13 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n
                 FALSE,
                 $acID
               );
-              $activity['assignee_contact_name'] .= $assigneeTypeImage . CRM_Utils_System::href($acName, 'civicrm/contact/view', "reset=1&cid={$acID}");
+              $assigneeLink = CRM_Utils_System::href($acName, 'civicrm/contact/view', "reset=1&cid={$acID}");
+              $activity['assignee_contact_name'] .= "<div>$assigneeTypeImage $assigneeLink";
               $count++;
               if ($count) {
-                $activity['assignee_contact_name'] .= ";&nbsp;";
+                $activity['assignee_contact_name'] .= ";";
               }
+              $activity['assignee_contact_name'] .= "</div> ";
 
               if ($count == 4) {
                 $activity['assignee_contact_name'] .= "(" . ts('more') . ")";