Replace smarty.get with assigned snippet_type in tpl

civicrm · Sep 29, 2023 · cecd68a · cecd68a
1 parent 51a1135
commit cecd68a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php
@@ -136,6 +136,7 @@ private function initialize() {
       'cacheCleanup' => CRM_Utils_Request::retrieveValue('cacheCleanup', 'Integer'),
       'configReset' => CRM_Utils_Request::retrieveValue('configReset', 'Integer'),
     ]);
+    $this->assign('snippet_type', CRM_Utils_Request::retrieveValue('snippet', 'String'));
 
     $tsLocale = CRM_Core_I18n::getLocale();
     $this->assign('tsLocale', $tsLocale);

diff --git a/templates/CRM/Form/validate.tpl b/templates/CRM/Form/validate.tpl
@@ -9,7 +9,7 @@
 *}
 {* Initialize jQuery validate on a form *}
 {* Extra params and functions may be added to the CRM.validate object before this template is loaded *}
-{if empty($crm_form_validate_included) && ((isset($smarty.get.snippet|smarty:nodefaults) && $smarty.get.snippet neq 'json') || !isset($smarty.get.snippet|smarty:nodefaults)) && !empty($form) && !empty($form.formClass)}
+{if empty($crm_form_validate_included) && $snippet_type neq 'json' && !empty($form) && !empty($form.formClass)}
   {assign var=crm_form_validate_included value=1}
   {literal}
   <script type="text/javascript">