CiviCRM 5.64 beta, latest, stock

This pulls in things that have been merged to the upstream rc since we deployed and also reverts the temporary patches we applied in order to get the upgrade script to run better. It is general housekeeping to keep grabbing the latest patches for our point version. But we also specifically want this patch civicrm/civicrm-core#26811 to revert the loss of the start date fields Patches merged to the rc since it was cut are here https://github.com/civicrm/civicrm-core/pulls?q=is%3Apr+is%3Aclosed+label%3A5.64 (although some of those were already merged when we pushed it out). Note this isn't in the sprint but it's better to get back to a 'stock' deployment before porting in the patch that I'm actually work on - ie civicrm/civicrm-core#26867 Bug: T341877 Change-Id: Ib6532188782545950441a42413d8751cd04b503d
wikimedia · Jul 18, 2023 · a5fe553 · a5fe553
1 parent b4b1e68
commit a5fe553
Show file tree

Hide file tree

Showing 15 changed files with 629 additions and 59 deletions.
diff --git a/drupal/sites/all/modules/civicrm/CRM/Case/Form/CaseView.php b/drupal/sites/all/modules/civicrm/CRM/Case/Form/CaseView.php
@@ -552,7 +552,7 @@ public static function activityForm($form) {
     $form->add('datepicker', 'activity_date_high_' . $form->_caseID, ts('To'), [], FALSE, ['time' => FALSE]);
 
     if (CRM_Core_Permission::check('administer CiviCRM')) {
-      $form->add('checkbox', 'activity_deleted', ts('Deleted Activities'), '', FALSE, ['id' => 'activity_deleted_' . $form->_caseID]);
+      $form->add('checkbox', 'activity_deleted', ts('Deleted Activities'), ['id' => 'activity_deleted_' . $form->_caseID], FALSE);
     }
   }
 

diff --git a/drupal/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php b/drupal/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -429,8 +429,9 @@ public function buildQuickForm() {
       $prms = ['id' => $this->_pcpId];
       CRM_Core_DAO::commonRetrieve('CRM_PCP_DAO_PCP', $prms, $pcpInfo);
       if ($pcpInfo['is_honor_roll']) {
-        $this->add('checkbox', 'pcp_display_in_roll', ts('Show my contribution in the public honor roll'), NULL, NULL,
-          ['onclick' => "showHideByValue('pcp_display_in_roll','','nameID|nickID|personalNoteID','block','radio',false); pcpAnonymous( );"]
+        $this->add('checkbox', 'pcp_display_in_roll', ts('Show my contribution in the public honor roll'),
+          ['onclick' => "showHideByValue('pcp_display_in_roll','','nameID|nickID|personalNoteID','block','radio',false); pcpAnonymous( );"],
+          FALSE
         );
         $extraOption = ['onclick' => "return pcpAnonymous( );"];
         $this->addRadio('pcp_is_anonymous', NULL, [ts('Include my name and message'), ts('List my contribution anonymously')], [], '&nbsp;&nbsp;&nbsp;', FALSE, [$extraOption, $extraOption]);

diff --git a/drupal/sites/all/modules/civicrm/CRM/Core/Form.php b/drupal/sites/all/modules/civicrm/CRM/Core/Form.php
@@ -1788,8 +1788,7 @@ public function addField($name, $props = [], $required = FALSE, $legacyDate = TR
     }
 
     // Core field - get metadata.
-    $fieldSpec = civicrm_api3($props['entity'], 'getfield', $props);
-    $fieldSpec = $fieldSpec['values'];
+    $fieldSpec = civicrm_api3($props['entity'], 'getfield', $props)['values'];
     $label = $props['label'] ?? $fieldSpec['html']['label'] ?? $fieldSpec['title'];
 
     $widget = $props['type'] ?? $fieldSpec['html']['type'];

diff --git a/drupal/sites/all/modules/civicrm/CRM/PCP/BAO/PCP.php b/drupal/sites/all/modules/civicrm/CRM/PCP/BAO/PCP.php
@@ -470,8 +470,9 @@ public static function buildPcp($pcpId, &$page, &$elements = NULL) {
     // build honor roll fields for registration form if supporter has honor roll enabled for their PCP
     if ($pcpInfo['is_honor_roll']) {
       $page->assign('is_honor_roll', TRUE);
-      $page->add('checkbox', 'pcp_display_in_roll', ts('Show my support in the public honor roll'), NULL, NULL,
-        ['onclick' => "showHideByValue('pcp_display_in_roll','','nameID|nickID|personalNoteID','block','radio',false); pcpAnonymous( );"]
+      $page->add('checkbox', 'pcp_display_in_roll', ts('Show my support in the public honor roll'),
+        ['onclick' => "showHideByValue('pcp_display_in_roll','','nameID|nickID|personalNoteID','block','radio',false); pcpAnonymous( );"],
+        FALSE
       );
       $extraOption = ['onclick' => "return pcpAnonymous( );"];
       $page->addRadio('pcp_is_anonymous', '', [ts('Include my name and message'), ts('List my support anonymously')], [], '&nbsp;&nbsp;&nbsp;', FALSE, [$extraOption, $extraOption]);

diff --git a/drupal/sites/all/modules/civicrm/CRM/Upgrade/Incremental/General.php b/drupal/sites/all/modules/civicrm/CRM/Upgrade/Incremental/General.php
@@ -33,7 +33,7 @@ class CRM_Upgrade_Incremental_General {
    *
    * A site running an earlier version will be told to upgrade.
    */
-  const MIN_RECOMMENDED_PHP_VER = '7.3.0';
+  const MIN_RECOMMENDED_PHP_VER = '7.4.0';
 
   /**
    * The minimum PHP version required to install Civi.

diff --git a/drupal/sites/all/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyThree.php b/drupal/sites/all/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyThree.php
@@ -40,28 +40,14 @@ public function upgrade_5_63_alpha1(string $rev): void {
     $this->addTask(ts('Drop index %1', [1 => 'civicrm_campaign.UI_campaign_status_id']), 'dropIndex', 'civicrm_campaign', 'UI_campaign_status_id');
     $this->addTask(ts('Create index %1', [1 => 'civicrm_campaign.index_status_id']), 'addIndex', 'civicrm_campaign', 'status_id', 'index');
     $this->addTask('Add default value to civicrm_campaign.created_date', 'alterColumn', 'civicrm_campaign', 'created_date', "datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time that Campaign was created.'");
-    $this->addTask('Enable component extensions', 'enableExtensions');
+
+    $enabledComponents = Civi::settings()->get('enable_components');
+    $extensions = array_map(['CRM_Utils_String', 'convertStringToSnakeCase'], $enabledComponents);
+    $this->addExtensionTask('Enable component extensions', $extensions);
 
     $this->addTask('Make ContributionPage.name required', 'alterColumn', 'civicrm_contribution_page', 'name', "varchar(255) NOT NULL COMMENT 'Unique name for identifying contribution page'");
     $this->addTask('Make ContributionPage.title required', 'alterColumn', 'civicrm_contribution_page', 'title', "varchar(255) NOT NULL COMMENT 'Contribution Page title. For top of page display'", TRUE);
     $this->addTask('Make ContributionPage.frontend_title required', 'alterColumn', 'civicrm_contribution_page', 'frontend_title', "varchar(255) NOT NULL COMMENT 'Contribution Page Public title'", TRUE);
   }
 
-  /**
-   * Since I hit a bug with core code this enables the new core extensions for WMF directly.
-   *
-   * Ref https://lab.civicrm.org/dev/core/-/issues/4424 for the bug details.
-   *
-   * Note our components are
-   *
-   *  a:6:{i:0;s:9:"CiviEvent";i:1;s:14:"CiviContribute";i:2;s:8:"CiviMail";i:3;s:10:"CiviPledge";i:4;s:10:"CiviReport";i:5;s:12:"CiviCampaign";}
-   * @return bool
-   */
-  public function enableExtensions() {
-    civicrm_api3('Extension', 'install', [
-      'keys' => ["civi_report", "civi_contribute", "civi_event", "civi_mail", "civi_pledge", "civi_campaign"],
-    ]);
-    return TRUE;
-  }
-
 }
diff --git a/drupal/sites/all/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php b/drupal/sites/all/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php
@@ -49,6 +49,12 @@ public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NU
       if (version_compare($currentVer, '5.57.alpha1', '>')) {
         $docUrl = 'https://civicrm.org/redirect/activities-5.57';
         $docAnchor = 'target="_blank" href="' . htmlentities($docUrl) . '"';
+        if (CRM_Core_DAO::singleValueQuery('SELECT COUNT(id) FROM civicrm_activity WHERE is_current_revision = 0')) {
+          // Text copied from FiveFifty Seven
+          $preUpgradeMessage .= '<p>' . ts('Your database contains CiviCase activity revisions which are deprecated and will begin to appear as duplicates in SearchKit/api4/etc.<ul><li>For further instructions see this <a %1>Lab Snippet</a>.</li></ul>', [1 => $docAnchor]) . '</p>';
+          // New text explaination as to why we show this again.
+          $preUpgradeMessage .= '<p>' . ts('Note: You might have followed these steps already but unfortunately a previous upgrade which started ignoring the setting to create CiviCase Activity revisions failed to account for all the places this functionality existed. This means that either new Revisions have been added since you removed them, or not all were removed.') . '</p>';
+        }
       }
     }
   }

diff --git a/drupal/sites/all/modules/civicrm/release-notes.md b/drupal/sites/all/modules/civicrm/release-notes.md
@@ -15,6 +15,17 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
+## CiviCRM 5.64.0
+
+Released August 2, 2023
+
+- **[Synopsis](release-notes/5.64.0.md#synopsis)**
+- **[Features](release-notes/5.64.0.md#features)**
+- **[Bugs resolved](release-notes/5.64.0.md#bugs)**
+- **[Miscellany](release-notes/5.64.0.md#misc)**
+- **[Credits](release-notes/5.64.0.md#credits)**
+- **[Feedback](release-notes/5.64.0.md#feedback)**
+
 ## CiviCRM 5.63.0
 
 Released July 5, 2023