civicrm release-5.42.1

civicrm.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: CiviCRM
  * Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.42.0
+ * Version: 5.42.1
  * Requires at least: 4.9
  * Requires PHP:      7.2
  * Author: CiviCRM LLC
@@ -54,7 +54,7 @@ if (!defined('ABSPATH')) {
 }
 
 // Set version here: when it changes, will force Javascript & CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.42.0');
+define('CIVICRM_PLUGIN_VERSION', '5.42.1');
 
 // Store reference to this file.
 if (!defined('CIVICRM_PLUGIN_FILE')) {

civicrm/api/v3/Membership.php

@@ -90,9 +90,19 @@ function civicrm_api3_membership_create($params) {
 
   // Calculate membership dates
   // Fixme: This code belongs in the BAO
-  if (!empty($params['num_terms'])) {
+  if (empty($params['id']) || !empty($params['num_terms'])) {
     // If this is a new membership or we have a specified number of terms calculate membership dates.
-    if (!empty($params['id'])) {
+    if (empty($params['id'])) {
+      // This is a new membership, calculate the membership dates.
+      $calcDates = CRM_Member_BAO_MembershipType::getDatesForMembershipType(
+        $params['membership_type_id'],
+        CRM_Utils_Array::value('join_date', $params),
+        CRM_Utils_Array::value('start_date', $params),
+        CRM_Utils_Array::value('end_date', $params),
+        CRM_Utils_Array::value('num_terms', $params, 1)
+      );
+    }
+    else {
       // This is an existing membership, calculate the membership dates after renewal
       // num_terms is treated as a 'special sauce' for is_renewal but this
       // isn't really helpful for completing pendings.
@@ -102,10 +112,10 @@ function civicrm_api3_membership_create($params) {
         CRM_Utils_Array::value('membership_type_id', $params),
         $params['num_terms']
       );
-      foreach (['join_date', 'start_date', 'end_date'] as $date) {
-        if (empty($params[$date]) && isset($calcDates[$date])) {
-          $params[$date] = $calcDates[$date];
-        }
+    }
+    foreach (['join_date', 'start_date', 'end_date'] as $date) {
+      if (empty($params[$date]) && isset($calcDates[$date])) {
+        $params[$date] = $calcDates[$date];
       }
     }
   }

civicrm/api/v3/Order.php

@@ -304,6 +304,8 @@ function _civicrm_api3_order_delete_spec(array &$params) {
  */
 function _order_create_wrangle_membership_params(array &$membershipParams) {
   $fields = Membership::getFields(FALSE)->execute()->indexBy('name');
+  // Ensure this legacy parameter is not true.
+  $membershipParams['skipStatusCal'] = FALSE;
   foreach ($fields as $fieldName => $field) {
     $customFieldName = 'custom_' . ($field['custom_field_id'] ?? NULL);
     if ($field['type'] === ['Custom'] && isset($membershipParams[$customFieldName])) {

civicrm/civicrm-version.php

 <?php
 /** @deprecated */
 function civicrmVersion( ) {
-  return array( 'version'  => '5.42.0',
+  return array( 'version'  => '5.42.1',
                 'cms'      => 'Wordpress',
                 'revision' => '' );
 }

civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php

@@ -124,7 +124,7 @@ class AfformAdminMeta {
     $fields = (array) civicrm_api4($entityName, 'getFields', $params);
 
     // Add implicit joins to search fields
-    if ($params['action'] === 'search') {
+    if ($params['action'] === 'get') {
       foreach (array_reverse($fields, TRUE) as $index => $field) {
         if (!empty($field['fk_entity']) && !$field['options']) {
           $fkLabelField = CoreUtil::getInfoItem($field['fk_entity'], 'label_field');

civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php

@@ -161,7 +161,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
     }
 
     if ($info['definition']['type'] === 'search') {
-      $getFieldsMode = 'search';
+      $getFieldsMode = 'get';
       $displayTags = [];
       if ($newForm) {
         [$searchName, $displayName] = array_pad(explode('.', $this->entity ?? ''), 2, '');

civicrm/ext/afform/admin/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

civicrm/ext/afform/core/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

civicrm/ext/afform/html/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.23</ver>

civicrm/ext/afform/mock/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/authx/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-02-11</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.0</ver>

civicrm/ext/ckeditor4/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-05-23</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.39</ver>

civicrm/ext/contributioncancelactions/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-12</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.32</ver>

civicrm/ext/eventcart/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-03</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/ewaysingle/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-07</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/financialacls/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-27</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.30</ver>

civicrm/ext/flexmailer/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-05</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>stable</develStage>
   <comments>
     FlexMailer is an email delivery engine which replaces the internal guts

civicrm/ext/greenwich/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-07-21</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/legacycustomsearches/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-07-25</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:hidden</tag>

civicrm/ext/oauth-client/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-23</releaseDate>
-  <version>5.42.0</version>
+  <version>5.42.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.38</ver>