From f8185bb1a04e2552ff33070c6b0edd7aa05f962c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 23 Feb 2023 16:46:25 -0800
Subject: [PATCH] ext/message_admin - Update to civix v23.02.0

---
 ext/message_admin/info.xml                |  3 ++-
 ext/message_admin/message_admin.civix.php | 14 --------------
 ext/message_admin/message_admin.php       | 11 -----------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml
index 1b9189b125..db3d31e710 100644
--- a/ext/message_admin/info.xml
+++ b/ext/message_admin/info.xml
@@ -31,9 +31,10 @@
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/MessageAdmin</namespace>
-    <format>22.12.1</format>
+    <format>23.02.0</format>
   </civix>
 </extension>
diff --git a/ext/message_admin/message_admin.civix.php b/ext/message_admin/message_admin.civix.php
index b386a62dc7..78da356905 100644
--- a/ext/message_admin/message_admin.civix.php
+++ b/ext/message_admin/message_admin.civix.php
@@ -92,9 +92,6 @@ function _message_admin_civix_civicrm_config($config = NULL) {
   $configured = TRUE;
 
   $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
-  $extDir = $extRoot . 'templates';
-  CRM_Core_Smarty::singleton()->addTemplateDir($extDir);
-
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
   set_include_path($include_path);
   // Based on <compatibility>, this does not currently require mixin/polyfill.php.
@@ -201,14 +198,3 @@ function _message_admin_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $paren
     }
   }
 }
-
-/**
- * (Delegated) Implements hook_civicrm_entityTypes().
- *
- * Find any *.entityType.php files, merge their content, and return.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
- */
-function _message_admin_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, []);
-}
diff --git a/ext/message_admin/message_admin.php b/ext/message_admin/message_admin.php
index 872e322729..41fa59a346 100644
--- a/ext/message_admin/message_admin.php
+++ b/ext/message_admin/message_admin.php
@@ -32,17 +32,6 @@ function message_admin_civicrm_enable() {
   _message_admin_civix_civicrm_enable();
 }
 
-/**
- * Implements hook_civicrm_entityTypes().
- *
- * Declare entity types provided by this module.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
- */
-function message_admin_civicrm_entityTypes(&$entityTypes) {
-  _message_admin_civix_civicrm_entityTypes($entityTypes);
-}
-
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**
-- 
2.25.1