From f363ca463531c90d4d5466eb9e88b4efd685c5c2 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sun, 25 Jun 2023 21:58:37 -0700
Subject: [PATCH] Move last (hopefully) custom search classes to the extension,
 unhide

---
 .../legacycustomsearches/CRM}/Contact/BAO/SearchCustom.php   | 0
 .../legacycustomsearches/CRM}/Contact/Page/CustomSearch.php  | 0
 ext/legacycustomsearches/CRM/Contact/Selector/Custom.php     | 2 +-
 ext/legacycustomsearches/info.xml                            | 5 +----
 .../templates}/CRM/Contact/Page/CustomSearch.hlp             | 0
 .../templates}/CRM/Contact/Page/CustomSearch.tpl             | 0
 6 files changed, 2 insertions(+), 5 deletions(-)
 rename {CRM => ext/legacycustomsearches/CRM}/Contact/BAO/SearchCustom.php (100%)
 rename {CRM => ext/legacycustomsearches/CRM}/Contact/Page/CustomSearch.php (100%)
 rename {templates => ext/legacycustomsearches/templates}/CRM/Contact/Page/CustomSearch.hlp (100%)
 rename {templates => ext/legacycustomsearches/templates}/CRM/Contact/Page/CustomSearch.tpl (100%)

diff --git a/CRM/Contact/BAO/SearchCustom.php b/ext/legacycustomsearches/CRM/Contact/BAO/SearchCustom.php
similarity index 100%
rename from CRM/Contact/BAO/SearchCustom.php
rename to ext/legacycustomsearches/CRM/Contact/BAO/SearchCustom.php
diff --git a/CRM/Contact/Page/CustomSearch.php b/ext/legacycustomsearches/CRM/Contact/Page/CustomSearch.php
similarity index 100%
rename from CRM/Contact/Page/CustomSearch.php
rename to ext/legacycustomsearches/CRM/Contact/Page/CustomSearch.php
diff --git a/ext/legacycustomsearches/CRM/Contact/Selector/Custom.php b/ext/legacycustomsearches/CRM/Contact/Selector/Custom.php
index b58922b0e5..7170f7e821 100644
--- a/ext/legacycustomsearches/CRM/Contact/Selector/Custom.php
+++ b/ext/legacycustomsearches/CRM/Contact/Selector/Custom.php
@@ -449,7 +449,7 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
       Civi::service('prevnext')->fillWithSql($cacheKey, $sql);
     }
     catch (\Exception $e) {
-      CRM_Core_Error::deprecatedFunctionWarning('Custom searches should return sql capable of filling the prevnext cache.');
+      CRM_Core_Error::deprecatedFunctionWarning('Custom searches should override this function or return sql capable of filling the prevnext cache.');
       // This will always show for CiviRules :-( as a) it orders by 'rule_label'
       // which is not available in the query & b) it uses contact not contact_a
       // as an alias.
diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml
index d59c1bbf80..55f90ad4da 100644
--- a/ext/legacycustomsearches/info.xml
+++ b/ext/legacycustomsearches/info.xml
@@ -17,13 +17,10 @@
   <releaseDate>2021-07-25</releaseDate>
   <version>5.64.alpha1</version>
   <develStage>stable</develStage>
-  <tags>
-    <tag>mgmt:hidden</tag>
-  </tags>
   <compatibility>
     <ver>5.64</ver>
   </compatibility>
-  <comments>This is hidden on install to give extensions that require it time to add it to their requires and to allow us to get it out of GroupContact load</comments>
+  <comments>This is our old search system which has limited support. All new effort is on SearchKit</comments>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
     <psr4 prefix="Civi\" path="Civi"/>
diff --git a/templates/CRM/Contact/Page/CustomSearch.hlp b/ext/legacycustomsearches/templates/CRM/Contact/Page/CustomSearch.hlp
similarity index 100%
rename from templates/CRM/Contact/Page/CustomSearch.hlp
rename to ext/legacycustomsearches/templates/CRM/Contact/Page/CustomSearch.hlp
diff --git a/templates/CRM/Contact/Page/CustomSearch.tpl b/ext/legacycustomsearches/templates/CRM/Contact/Page/CustomSearch.tpl
similarity index 100%
rename from templates/CRM/Contact/Page/CustomSearch.tpl
rename to ext/legacycustomsearches/templates/CRM/Contact/Page/CustomSearch.tpl
-- 
2.25.1