From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 2 Oct 2017 22:58:40 +0000 (-0400)
Subject: CRM-21247 - Fix user link
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9064d9702e0a77eae7d550b53001782fde545994;p=civicrm-core.git

CRM-21247 - Fix user link
---

diff --git a/templates/CRM/Contact/Page/Inline/Actions.tpl b/templates/CRM/Contact/Page/Inline/Actions.tpl
index 9dbf7eecce..ef94ca3fc2 100644
--- a/templates/CRM/Contact/Page/Inline/Actions.tpl
+++ b/templates/CRM/Contact/Page/Inline/Actions.tpl
@@ -39,7 +39,7 @@
             {foreach from=$actionsMenuList.otherActions item='row'}
               {if !empty($row.href) or !empty($row.tab)}
               <li class="crm-contact-{$row.ref}">
-                <a href="{if !empty($row.href)}{$row.href}&cid={$contactId}{else}#{/if}" title="{$row.title|escape}" data-tab="{$row.tab}" {if !empty($row.class)}class="{$row.class}"{/if}>
+                <a href="{if !empty($row.href)}{$row.href}{if strstr($row.href, '?')}&cid={$contactId}{/if}{else}#{/if}" title="{$row.title|escape}" data-tab="{$row.tab}" {if !empty($row.class)}class="{$row.class}"{/if}>
                   <span><i {if !empty($row.icon)}class="{$row.icon}"{/if}></i> {$row.title}</span>
                 </a>
               </li>
@@ -52,7 +52,7 @@
           {foreach from=$actionsMenuList.moreActions item='row'}
           {if !empty($row.href) or !empty($row.tab)}
           <li class="crm-action-{$row.ref}">
-            <a href="{if !empty($row.href)}{$row.href}&cid={$contactId}{else}#{/if}" title="{$row.title|escape}" data-tab="{$row.tab}" {if !empty($row.class)}class="{$row.class}"{/if}>{$row.title}</a>
+            <a href="{if !empty($row.href)}{$row.href}{if strstr($row.href, '?')}&cid={$contactId}{/if}{else}#{/if}" title="{$row.title|escape}" data-tab="{$row.tab}" {if !empty($row.class)}class="{$row.class}"{/if}>{$row.title}</a>
           </li>
           {/if}
         {/foreach}