From: Tim Otten <totten@civicrm.org>
Date: Thu, 10 Jul 2014 02:55:02 +0000 (-0700)
Subject: CRM-14949 - Replace {$timeGenerated} with {$smarty.now}
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=51b81901bcd0ec1f5f14779409f2ece6ad06d36b;p=civicrm-core.git

CRM-14949 - Replace {$timeGenerated} with {$smarty.now}
---

diff --git a/CRM/Core/Page/AJAX.php b/CRM/Core/Page/AJAX.php
index 4de7604307..b9ea566d03 100644
--- a/CRM/Core/Page/AJAX.php
+++ b/CRM/Core/Page/AJAX.php
@@ -206,7 +206,6 @@ class CRM_Core_Page_AJAX {
    */
   static function returnDynamicJS($tplFile, $vars = array()) {
     $smarty = CRM_Core_Smarty::singleton();
-    $vars += array('timeGenerated' => date('d M Y H:i:s'));
     foreach ($vars as $name => $val) {
       $smarty->assign($name, $val);
     }
diff --git a/templates/CRM/common/localization.js.tpl b/templates/CRM/common/localization.js.tpl
index 4f5982cc19..1edeffa6c8 100644
--- a/templates/CRM/common/localization.js.tpl
+++ b/templates/CRM/common/localization.js.tpl
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}// http://civicrm.org/licensing
-// <script> Generated {$timeGenerated}
+// <script> Generated {$smarty.now|date_format:'%d %b %Y %H:%M:%S'}
 {* This file should only contain strings and settings which rarely change *}
 (function($) {ldelim}
   // Config settings
diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl
index 094d9acfb4..1c32d33fc0 100644
--- a/templates/CRM/common/navigation.js.tpl
+++ b/templates/CRM/common/navigation.js.tpl
@@ -53,7 +53,7 @@
     {/if}
     {$navigation}
   </ul>
-{/strip}{/capture}// <script> Generated {$timeGenerated}
+{/strip}{/capture}// <script> Generated {$smarty.now|date_format:'%d %b %Y %H:%M:%S'}
 {literal}
 (function($) {
   var menuMarkup = {/literal}{$menuMarkup|@json_encode};