From 8ac3366c96e269e818c4a94ae5fa2b4e7945e3b2 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 27 Nov 2022 11:43:38 -0500 Subject: [PATCH] SearchKit - Install before extension upgrades --- CRM/Upgrade/Incremental/Base.php | 8 ++++++-- CRM/Upgrade/Incremental/php/FiveFiftySeven.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CRM/Upgrade/Incremental/Base.php b/CRM/Upgrade/Incremental/Base.php index 2152b11c24..fcc3f9104e 100644 --- a/CRM/Upgrade/Incremental/Base.php +++ b/CRM/Upgrade/Incremental/Base.php @@ -195,11 +195,15 @@ class CRM_Upgrade_Incremental_Base { * @param string $title * @param string[] $keys * List of extensions to enable. + * @param int $weight + * A weight > 1500 will install after extension upgrades run. Do this for brand-new extensions. + * A weight < 1500 will install before extension upgrades. Do this if the extension may + * have previously been enabled. */ - protected function addExtensionTask(string $title, array $keys): void { + protected function addExtensionTask(string $title, array $keys, int $weight = 2000): void { Civi::queue(CRM_Upgrade_Form::QUEUE_NAME)->createItem( new CRM_Queue_Task([static::CLASS, 'enableExtension'], [$keys], $title), - ['weight' => 2000] + ['weight' => $weight] ); } diff --git a/CRM/Upgrade/Incremental/php/FiveFiftySeven.php b/CRM/Upgrade/Incremental/php/FiveFiftySeven.php index f050f3dd56..33afb62b0e 100644 --- a/CRM/Upgrade/Incremental/php/FiveFiftySeven.php +++ b/CRM/Upgrade/Incremental/php/FiveFiftySeven.php @@ -29,7 +29,7 @@ class CRM_Upgrade_Incremental_php_FiveFiftySeven extends CRM_Upgrade_Incremental */ public function upgrade_5_57_alpha1($rev): void { $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addExtensionTask('Enable SearchKit extension', ['org.civicrm.search_kit']); + $this->addExtensionTask('Enable SearchKit extension', ['org.civicrm.search_kit'], 1100); } } -- 2.25.1