search_kit, civigrant - Use mixin 'smarty-v2'

diff --git a/ext/civigrant/civigrant.civix.php b/ext/civigrant/civigrant.civix.php
index 424cd9e19a3db0d8b6cddb0f01ccd9039209a386..0b066cd2fa0f04c8b377b162cc8bd6c410f2309c 100644 (file)
--- 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 f724f1f2b5c326f9fcf59277950e6b38ceb24d43..6c03b5ceffd0086ea272d5a24f7cdf85a30ba9df 100644 (file)
--- 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 629172fbb77b53e7b79cc511fa1772d4f770b475..bc9af07dee13861cc55d1977ccbe3d8b5aaeff9f 100644 (file)
--- 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 414f9a73d43285ee313d7c4ff1895fe046891295..b74feb61fc6be7d47ba5853fa19ec5c684074691 100644 (file)
--- 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);