From c7bdf2cd006c1d0d6b7ee7dedd568adb0252a467 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Tue, 16 May 2023 10:02:46 -0400
Subject: [PATCH] civicrm release-5.61.2
---
civicrm.php | 4 +-
.../CRM/Contribute/Form/Contribution/Main.php | 27 ++-----------
.../CRM/Contribute/Form/ContributionBase.php | 23 +++++++++--
civicrm/CRM/Price/BAO/PriceSet.php | 9 ++---
civicrm/civicrm-version.php | 2 +-
civicrm/ext/afform/admin/info.xml | 2 +-
civicrm/ext/afform/core/info.xml | 2 +-
civicrm/ext/afform/html/info.xml | 2 +-
civicrm/ext/afform/mock/info.xml | 2 +-
civicrm/ext/authx/info.xml | 2 +-
civicrm/ext/civicrm_admin_ui/info.xml | 2 +-
civicrm/ext/civigrant/info.xml | 2 +-
civicrm/ext/civiimport/info.xml | 2 +-
civicrm/ext/ckeditor4/info.xml | 2 +-
.../ext/contributioncancelactions/info.xml | 2 +-
civicrm/ext/elavon/info.xml | 2 +-
civicrm/ext/eventcart/info.xml | 2 +-
civicrm/ext/ewaysingle/info.xml | 2 +-
civicrm/ext/financialacls/info.xml | 2 +-
civicrm/ext/flexmailer/info.xml | 2 +-
civicrm/ext/greenwich/info.xml | 2 +-
civicrm/ext/legacycustomsearches/info.xml | 2 +-
civicrm/ext/message_admin/info.xml | 2 +-
civicrm/ext/oauth-client/info.xml | 2 +-
civicrm/ext/payflowpro/info.xml | 2 +-
civicrm/ext/recaptcha/info.xml | 2 +-
civicrm/ext/search_kit/info.xml | 2 +-
civicrm/ext/sequentialcreditnotes/info.xml | 2 +-
civicrm/release-notes.md | 9 +++++
civicrm/release-notes/5.61.2.md | 38 +++++++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
.../CRM/Contribute/Form/Contribution/Main.tpl | 2 +-
.../Form/Contribution/MembershipBlock.tpl | 5 ++-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 +++----
civicrm/vendor/composer/autoload_static.php | 12 +++---
civicrm/vendor/composer/installed.php | 4 +-
civicrm/xml/version.xml | 2 +-
39 files changed, 123 insertions(+), 80 deletions(-)
create mode 100644 civicrm/release-notes/5.61.2.md
diff --git a/civicrm.php b/civicrm.php
index 51c3709b4f..0fc732d65c 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.61.1
+ * Version: 5.61.2
* Requires at least: 4.9
* Requires PHP: 7.3
* Author: CiviCRM LLC
@@ -36,7 +36,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: changing it forces Javascript and CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.61.1');
+define('CIVICRM_PLUGIN_VERSION', '5.61.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Main.php b/civicrm/CRM/Contribute/Form/Contribution/Main.php
index 9819e8276c..b91317f3d2 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Main.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -373,7 +373,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
// build price set form.
$this->set('priceSetId', $this->_priceSetId);
if (empty($this->_ccid)) {
- CRM_Price_BAO_PriceSet::buildPriceSet($this);
+ CRM_Price_BAO_PriceSet::buildPriceSet($this, $this->getMainEntityType());
}
if ($this->_values['is_monetary'] &&
$this->_values['is_recur'] && empty($this->_values['pledge_id'])
@@ -512,6 +512,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
$this->_currentMemberships = [];
$membershipTypeIds = $membershipTypes = $radio = $radioOptAttrs = [];
+ // This is always true if this line is reachable - remove along with the upcoming if.
$membershipPriceset = (!empty($this->_priceSetId) && $this->isMembershipPriceSet());
$allowAutoRenewMembership = $autoRenewOption = FALSE;
@@ -635,28 +636,6 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
$autoRenewOption = CRM_Price_BAO_PriceSet::checkAutoRenewForPriceSet($this->_priceSetId);
$this->assign('autoRenewOption', $autoRenewOption);
- if (!$membershipPriceset) {
- if (!$this->_membershipBlock['is_required']) {
- $this->assign('showRadioNoThanks', TRUE);
- $radio['no_thanks'] = NULL;
- $this->addRadio('selectMembership', NULL, $radio, [], NULL, FALSE, $radioOptAttrs);
- }
- elseif ($this->_membershipBlock['is_required'] && count($radio) == 1) {
- $temp = array_keys($radio);
- $this->add('hidden', 'selectMembership', $temp[0], ['id' => 'selectMembership']);
- $this->assign('singleMembership', TRUE);
- $this->assign('showRadio', FALSE);
- }
- else {
- foreach ($radioOptAttrs as $opt => $attrs) {
- $attrs['class'] = ' required';
- }
- $this->addRadio('selectMembership', NULL, $radio, [], NULL, FALSE, $radioOptAttrs);
- }
-
- $this->addRule('selectMembership', ts('Please select one of the memberships.'), 'required');
- }
-
if ((!$this->_values['is_pay_later'] || is_array($this->_paymentProcessors)) && ($allowAutoRenewMembership || $autoRenewOption)) {
if ($autoRenewOption == 2) {
$this->addElement('hidden', 'auto_renew', ts('Please renew my membership automatically.'));
@@ -784,6 +763,8 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
$self->_useForMember
)
) {
+
+ // appears to be unreachable - selectMembership never set...
$isTest = $self->_action & CRM_Core_Action::PREVIEW;
$lifeMember = CRM_Member_BAO_Membership::getAllContactMembership($self->_membershipContactID, $isTest, TRUE);
diff --git a/civicrm/CRM/Contribute/Form/ContributionBase.php b/civicrm/CRM/Contribute/Form/ContributionBase.php
index 8ea9c95123..1d41e1ae54 100644
--- a/civicrm/CRM/Contribute/Form/ContributionBase.php
+++ b/civicrm/CRM/Contribute/Form/ContributionBase.php
@@ -446,6 +446,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
$this->set('values', $this->_values);
$this->set('fields', $this->_fields);
}
+ $this->assign('isShowMembershipQuickConfigBlock', $this->isShowMembershipQuickConfigBlock());
$this->set('membershipBlock', $this->getMembershipBlock());
// Handle PCP
@@ -1304,9 +1305,8 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
*/
protected function isMembershipPriceSet(): bool {
if ($this->_useForMember === NULL) {
- if (CRM_Core_Component::isEnabled('CiviMember') &&
- (!$this->isQuickConfig() || !empty($this->_ccid)) &&
- (int) CRM_Core_Component::getComponentID('CiviMember') === (int) $this->order->getPriceSetMetadata()['extends']) {
+ if ($this->getMainEntityType() === 'membership' &&
+ !$this->isQuickConfig()) {
$this->_useForMember = 1;
}
else {
@@ -1317,6 +1317,23 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
return (bool) $this->_useForMember;
}
+ public function getMainEntityType() {
+ if (CRM_Core_Component::isEnabled('CiviMember') && (int) CRM_Core_Component::getComponentID('CiviMember') === (int) $this->order->getPriceSetMetadata()['extends']) {
+ return 'membership';
+ }
+ return 'contribution';
+ }
+
+ /**
+ * Should the membership block be displayed.
+ *
+ * This should be shown when the price set is quick config and is a membership price set.
+ * @return bool
+ */
+ protected function isShowMembershipQuickConfigBlock(): bool {
+ return CRM_Core_Component::isEnabled('CiviMember') && $this->getMembershipBlock() && $this->isQuickConfig();
+ }
+
/**
* Is the contribution page configured for 2 payments, one being membership & one not.
*
diff --git a/civicrm/CRM/Price/BAO/PriceSet.php b/civicrm/CRM/Price/BAO/PriceSet.php
index a5840caee4..f1097f3304 100644
--- a/civicrm/CRM/Price/BAO/PriceSet.php
+++ b/civicrm/CRM/Price/BAO/PriceSet.php
@@ -811,10 +811,11 @@ WHERE id = %1";
* Build the price set form.
*
* @param CRM_Core_Form $form
+ * @param string|null $component
*
* @return void
*/
- public static function buildPriceSet(&$form) {
+ public static function buildPriceSet(&$form, $component = NULL) {
$priceSetId = $form->get('priceSetId');
if (!$priceSetId) {
return;
@@ -867,23 +868,19 @@ WHERE id = %1";
$form->_priceSet['id'] = $form->_priceSet['id'] ?? $priceSetId;
$form->assign('priceSet', $form->_priceSet);
- $component = 'contribution';
if ($className == 'CRM_Member_Form_Membership') {
$component = 'membership';
}
if ($className == 'CRM_Contribute_Form_Contribution_Main') {
$feeBlock = &$form->_values['fee'];
- if (!empty($form->_useForMember)) {
- $component = 'membership';
- }
}
else {
$feeBlock = &$form->_priceSet['fields'];
}
// Call the buildAmount hook.
- CRM_Utils_Hook::buildAmount($component, $form, $feeBlock);
+ CRM_Utils_Hook::buildAmount($component ?? 'contribution', $form, $feeBlock);
self::addPriceFieldsToForm($form, $feeBlock, $validFieldsOnly, $className, $validPriceFieldIds);
}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index a78c77b0c6..30e6654ffd 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.61.1',
+ return array( 'version' => '5.61.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 9ae2819be2..61e5d5937e 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 642be7a92d..f463209ec9 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 61500df524..6e7eca950b 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index f1c9782a1e..23ef406bfc 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -12,7 +12,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 2049b49091..091d383e86 100644
--- a/civicrm/ext/authx/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index d3b77c5eb0..dd7c953c5c 100644
--- a/civicrm/ext/civicrm_admin_ui/info.xml
+++ b/civicrm/ext/civicrm_admin_ui/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-01-02</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 15076dbb17..a4ccdb1875 100644
--- a/civicrm/ext/civigrant/info.xml
+++ b/civicrm/ext/civigrant/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-11-11</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index ba688a0ada..6ec0c2e79a 100644
--- a/civicrm/ext/civiimport/info.xml
+++ b/civicrm/ext/civiimport/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-08-11</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index ef39808484..632f2961c9 100644
--- a/civicrm/ext/ckeditor4/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index e71c1d7e56..132737d9e3 100644
--- a/civicrm/ext/contributioncancelactions/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 53c9fe47da..672304495e 100644
--- a/civicrm/ext/elavon/info.xml
+++ b/civicrm/ext/elavon/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-08-05</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 55e6aafa1d..180c8427c7 100644
--- a/civicrm/ext/eventcart/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index bea226e36d..a6c127b652 100644
--- a/civicrm/ext/ewaysingle/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 3c1f9bd3b5..e06fe1e018 100644
--- a/civicrm/ext/financialacls/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 45c348cffc..8d51305e41 100644
--- a/civicrm/ext/flexmailer/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<comments>
FlexMailer is an email delivery engine which replaces the internal guts
diff --git a/civicrm/ext/greenwich/info.xml b/civicrm/ext/greenwich/info.xml
index 70b3b921b3..5fe955dcb3 100644
--- a/civicrm/ext/greenwich/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 0fd729e854..33888e32c5 100644
--- a/civicrm/ext/legacycustomsearches/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index 39bb0f660d..36c2d4b0dc 100644
--- a/civicrm/ext/message_admin/info.xml
+++ b/civicrm/ext/message_admin/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-06-12</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index db888a9e7a..6cb5f5bffb 100644
--- a/civicrm/ext/oauth-client/info.xml
+++ b/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.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 6ada15c9b0..a4cd20258e 100644
--- a/civicrm/ext/payflowpro/info.xml
+++ b/civicrm/ext/payflowpro/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-13</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 890ca4a231..e0389fb017 100644
--- a/civicrm/ext/recaptcha/info.xml
+++ b/civicrm/ext/recaptcha/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-03</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 4094ee3474..dcd87dc961 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-06</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index a4c729a236..55ab4ca7f6 100644
--- a/civicrm/ext/sequentialcreditnotes/info.xml
+++ b/civicrm/ext/sequentialcreditnotes/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-28</releaseDate>
- <version>5.61.1</version>
+ <version>5.61.2</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 7a91c862a8..c3c4d2e8a7 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -15,6 +15,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.61.2
+
+Released May 8, 2023
+
+- **[Synopsis](release-notes/5.61.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.61.2.md#bugs)**
+- **[Credits](release-notes/5.61.2.md#credits)**
+- **[Feedback](release-notes/5.61.2.md#feedback)**
+
## CiviCRM 5.61.1
Released May 5, 2023
diff --git a/civicrm/release-notes/5.61.2.md b/civicrm/release-notes/5.61.2.md
new file mode 100644
index 0000000000..09ef0612d7
--- /dev/null
+++ b/civicrm/release-notes/5.61.2.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.61.2
+
+Released May 8, 2023
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+| Fix security vulnerabilities? | no |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviMember_: Cannot submit certain membership forms (non-"quick config" forms) ([dev/core#4282](https://lab.civicrm.org/dev/core/-/issues/4282): [#26170](https://github.com/civicrm/civicrm-core/pull/26170))**
+* **_Drupal_: Extraneous warnings logged for non-CiviCRM pages (Drupal 8/9/10) ([drupal#85](https://github.com/civicrm/civicrm-drupal-8/pull/85))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Semper IT - Karin Gerritsen; HeneryH; Fuzion -
+Jitendra Purohit; Dave D; composerjk; CiviCRM - Tim Otten
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index a9fa10da98..ed49f429fd 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23678,4 +23678,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.61.1';
+UPDATE civicrm_domain SET version = '5.61.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index f15128d1f4..7d6bafcf96 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -3059,7 +3059,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES
- (1,'Default Domain Name',NULL,'5.61.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.61.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
index a7ee32e09e..3a0c541a7e 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -76,7 +76,7 @@
<div class="help">{ts}You have a current Lifetime Membership which does not need to be renewed.{/ts}</div>
{/if}
- {if !empty($useForMember) && !$ccid}
+ {if $isShowMembershipQuickConfigBlock && !$ccid}
<div class="crm-public-form-item crm-section">
{include file="CRM/Contribute/Form/Contribution/MembershipBlock.tpl" context="makeContribution"}
</div>
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 796834c64b..fd70bbe249 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -7,7 +7,7 @@
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
-{if !empty($useForMember) AND !$is_quick_config}
+{if $isShowMembershipQuickConfigBlock}
<div id="membership" class="crm-group membership-group">
{if $context EQ "makeContribution"}
<div id="priceset">
@@ -158,6 +158,7 @@
{foreach from=$membershipTypes item=row}
<tr {if $context EQ "makeContribution"}class="odd-row" {/if}valign="top">
{if $showRadio }
+ {* unreachable - show radio is never true *}
{assign var="pid" value=$row.id}
<td style="width: 1em;">{$form.selectMembership.$pid.html}</td>
{else}
@@ -203,7 +204,7 @@
</td>
</tr>
{/if}
- {if $showRadio}
+ {if $showRadio}{* unreachable *}
{if $showRadioNoThanks } {* Provide no-thanks option when Membership signup is not required - per membership block configuration. *}
<tr class="odd-row">
<td>{$form.selectMembership.no_thanks.html}</td>
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index c0310fbb65..6156998a3b 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5::getLoader();
+return ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index c1dc5d647a..6387f47cca 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5
+class ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitb2e964434007560ae238a86ef426dac5::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitb2e964434007560ae238a86ef426dac5::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireb2e964434007560ae238a86ef426dac5($fileIdentifier, $file);
+ composerRequire44b9c719a70155244dfb6c35eb6d8e26($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInitb2e964434007560ae238a86ef426dac5
* @param string $file
* @return void
*/
-function composerRequireb2e964434007560ae238a86ef426dac5($fileIdentifier, $file)
+function composerRequire44b9c719a70155244dfb6c35eb6d8e26($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 376b53fe6b..2b7d690b14 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitb2e964434007560ae238a86ef426dac5
+class ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -729,11 +729,11 @@ class ComposerStaticInitb2e964434007560ae238a86ef426dac5
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitb2e964434007560ae238a86ef426dac5::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 2ed1634d24..00551ead4f 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '8fd20b11d8a67e4c71ce5c6828fc358b00e87c94',
+ 'reference' => 'f87b1d41eb7420a6434b75f87dbcac32bb103f6b',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -43,7 +43,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '8fd20b11d8a67e4c71ce5c6828fc358b00e87c94',
+ 'reference' => 'f87b1d41eb7420a6434b75f87dbcac32bb103f6b',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 649a4c66f9..6a6e403897 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.61.1</version_no>
+ <version_no>5.61.2</version_no>
</version>
--
GitLab