From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Wed, 13 Aug 2014 23:18:17 +0000 (+1200)
Subject: CRM-15113 don't redirect if rgid is not filled in  - otherwise you wind up at an... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d71c4c9c4862eb667a1657737c933cfe231cc8c0;p=civicrm-core.git

CRM-15113 don't redirect if rgid is not filled in  - otherwise you wind up at an unfiltered dedupe calculation screen
---

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index 7bae2d328d..bf1fdb5147 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -35,7 +35,7 @@
 </div>
 
 <div class="action-link">
-       <a id='notDuplicate' href="#" title={ts}Mark this pair as not a duplicate.{/ts} onClick="processDupes( {$main_cid}, {$other_cid}, 'dupe-nondupe', 'merge-contact', '{crmURL p="civicrm/contact/dedupefind" q="reset=1&action=update&rgid=$rgid"}' );return false;">&raquo; {ts}Mark this pair as not a duplicate.{/ts}</a>
+       <a id='notDuplicate' href="#" title={ts}Mark this pair as not a duplicate.{/ts} onClick="processDupes( {$main_cid}, {$other_cid}, 'dupe-nondupe', 'merge-contact', '{if $rgid}{crmURL p="civicrm/contact/dedupefind" q="reset=1&action=update&rgid=$rgid"}{/if}' );return false;">&raquo; {ts}Mark this pair as not a duplicate.{/ts}</a>
 </div>
 
 <table>