From 9ea58cec731a981df62a2606b0ae3c3d0ff5a307 Mon Sep 17 00:00:00 2001
From: atif-shaikh <shaikh388@gmail.com>
Date: Wed, 14 Jan 2015 20:15:37 +0530
Subject: [PATCH] CRM-15804 - More appropriate fix

----------------------------------------
* CRM-15804: CiviEvent Date Picker broken in modal dialog
  https://issues.civicrm.org/jira/browse/CRM-15804
---
 templates/CRM/common/jcalendar.tpl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/CRM/common/jcalendar.tpl b/templates/CRM/common/jcalendar.tpl
index 2544df9713..99a22b0d55 100644
--- a/templates/CRM/common/jcalendar.tpl
+++ b/templates/CRM/common/jcalendar.tpl
@@ -50,11 +50,7 @@
 {/if}
 
 {* CRM-15804 - CiviEvent Date Picker broken in modal dialog *}
-{if $snippet}
-  {assign var='dialog'   value='_dialog'}
-{/if}
-
-{assign var='displayDate' value=$elementId|cat:"_display$dialog"}
+{assign var='displayDate' value=$elementId|cat:"_display"|cat:"_$string"|uniqid}
 
 {if $action neq 1028}
     <input type="text" name="{$displayDate}" id="{$displayDate}" class="dateplugin" autocomplete="off"/>
-- 
2.25.1