Merge pull request #11840 from mfb/smtp-reconnect

[civicrm-core.git] / templates / CRM / common / dedupe.tpl

diff --git a/templates/CRM/common/dedupe.tpl b/templates/CRM/common/dedupe.tpl
index 1b9b2a45d012bc26638d0703cb3d1d671bbaa331..23fc3a8129434469a754cc1840afc800e30511f1 100644 (file)
--- a/templates/CRM/common/dedupe.tpl
+++ b/templates/CRM/common/dedupe.tpl
@@ -1,11 +1,11 @@
 {* common dupe contacts processing *}
-<div id='processDupes' class="success-status" style="display:none;"></div>
+<div id='processDupes' style="display:none;"></div>
 {literal}
 <script type='text/javascript'>
 
 cj( '#processDupes' ).hide( );
 
-function processDupes( cid, oid, oper, context, reloadURL ) {
+function processDupes(cid, oid, oper, context, reloadURL) {
         //currently we are doing in a single way.
         //later we might want two way operations.
 
@@ -38,6 +38,13 @@ function processDupes( cid, oid, oper, context, reloadURL ) {
                                      // redirect after a small delay
                                      setTimeout("window.location.href = '" + reloadURL + "'", 500);
         }
+        else {
+          //CRM-15113 this has the effect of causing the alert to display. Also, as they are already 'actioned' Civi sensibly returns the browser to the
+          //search screen
+          setTimeout(function(){
+            window.location.reload();
+          }, 500);
+        }
       }
     }
   });