CRM-21247 - Fix user link

diff --git a/templates/CRM/Contact/Page/Inline/Actions.tpl b/templates/CRM/Contact/Page/Inline/Actions.tpl
index 9dbf7eeccef9b3b1d60edbb5ccae6b2cb3c280b6..ef94ca3fc211369f4c6df9b2af3105645c9dd617 100644 (file)
--- 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}