From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Jan 2023 05:06:22 +0000 (-0800)
Subject: search_kit, civigrant - Use mixin 'smarty-v2'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2be3292cba5de71ee261ff497c194b1c7e35acad;p=civicrm-core.git

search_kit, civigrant - Use mixin 'smarty-v2'
---

diff --git a/ext/civigrant/civigrant.civix.php b/ext/civigrant/civigrant.civix.php
index 424cd9e19a..0b066cd2fa 100644
--- a/ext/civigrant/civigrant.civix.php
+++ b/ext/civigrant/civigrant.civix.php
@@ -91,18 +91,7 @@ function _civigrant_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template = CRM_Core_Smarty::singleton();
-
   $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
-  $extDir = $extRoot . 'templates';
-
-  if (is_array($template->template_dir)) {
-    array_unshift($template->template_dir, $extDir);
-  }
-  else {
-    $template->template_dir = [$extDir, $template->template_dir];
-  }
-
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
   set_include_path($include_path);
 }
diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml
index f724f1f2b5..6c03b5ceff 100644
--- a/ext/civigrant/info.xml
+++ b/ext/civigrant/info.xml
@@ -32,6 +32,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>afform-entity-php@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Grant</namespace>
diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml
index 629172fbb7..bc9af07dee 100644
--- a/ext/search_kit/info.xml
+++ b/ext/search_kit/info.xml
@@ -35,6 +35,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>entity-types-php@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Search</namespace>
diff --git a/ext/search_kit/search_kit.civix.php b/ext/search_kit/search_kit.civix.php
index 414f9a73d4..b74feb61fc 100644
--- a/ext/search_kit/search_kit.civix.php
+++ b/ext/search_kit/search_kit.civix.php
@@ -91,17 +91,7 @@ function _search_kit_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template = CRM_Core_Smarty::singleton();
-
   $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
-  $extDir = $extRoot . 'templates';
-
-  if (is_array($template->template_dir)) {
-    array_unshift($template->template_dir, $extDir);
-  }
-  else {
-    $template->template_dir = [$extDir, $template->template_dir];
-  }
 
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
   set_include_path($include_path);