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

diff --git a/CRM/Core/Page/AJAX.php b/CRM/Core/Page/AJAX.php
index 4de7604307f0fb3c8c0c21fb72980722a8b77188..b9ea566d03fa8b090b86cdf99de0670177287ce9 100644 (file)
--- 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 4f5982cc190cf828a469f4eb324e3aa55b00cff7..1edeffa6c8f2357c12e0c2cc1af431f5e531ef0e 100644 (file)
--- 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 094d9acfb4eeea8305acd5916521eec18ee0746c..1c32d33fc0f717141e82f20383e8295ed4422742 100644 (file)
--- 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};