From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 21 Feb 2023 23:55:05 +0000 (+1300)
Subject: Fix master-only regression
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=185d82221be2ae57332a1c0e1a26dd05ec3224e6;p=civicrm-core.git

Fix master-only regression

I merged https://github.com/civicrm/civicrm-core/pull/25471 yesterday,
well after 5.60 branch forked, into master. However, it
includes upgrade script targetting 5.59 - which means that
for anyone already on 5.59 it doesn't run. This moves
it to the correct branch (5.60 aka master)
---

diff --git a/CRM/Upgrade/Incremental/php/FiveFiftyNine.php b/CRM/Upgrade/Incremental/php/FiveFiftyNine.php
index bc2c7bb709..b51a50c6af 100644
--- a/CRM/Upgrade/Incremental/php/FiveFiftyNine.php
+++ b/CRM/Upgrade/Incremental/php/FiveFiftyNine.php
@@ -39,7 +39,6 @@ class CRM_Upgrade_Incremental_php_FiveFiftyNine extends CRM_Upgrade_Incremental_
   public function upgrade_5_59_alpha1(string $rev): void {
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Drop column civicrm_custom_field.mask', 'dropColumn', 'civicrm_custom_field', 'mask');
-    $this->addTask('Add column civicrm_custom_field.fk_entity', 'addColumn', 'civicrm_custom_field', 'fk_entity', "varchar(255) DEFAULT NULL COMMENT 'Name of entity being referenced.'");
   }
 
 }
diff --git a/CRM/Upgrade/Incremental/php/FiveSixty.php b/CRM/Upgrade/Incremental/php/FiveSixty.php
index e9a690896c..70afe8046f 100644
--- a/CRM/Upgrade/Incremental/php/FiveSixty.php
+++ b/CRM/Upgrade/Incremental/php/FiveSixty.php
@@ -30,6 +30,8 @@ class CRM_Upgrade_Incremental_php_FiveSixty extends CRM_Upgrade_Incremental_Base
   public function upgrade_5_60_alpha1($rev): void {
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Add scheduled_reminder_smarty setting', 'addScheduledReminderSmartySetting');
+    $this->addTask('Add column civicrm_custom_field.fk_entity', 'addColumn', 'civicrm_custom_field', 'fk_entity', "varchar(255) DEFAULT NULL COMMENT 'Name of entity being referenced.'");
+
   }
 
   public function setPostUpgradeMessage(&$postUpgradeMessage, $rev): void {