From 46bd5e84025047eaea0d89243c3ca5dd2aafa040 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Sat, 20 May 2023 08:27:51 -0400
Subject: [PATCH] civicrm release-5.61.3
---
civicrm.php | 4 +-
.../CRM/Contribute/Form/ContributionBase.php | 12 ++++--
.../CRM/Financial/BAO/PaymentProcessor.php | 4 ++
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.3.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 | 6 +--
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 +-
38 files changed, 108 insertions(+), 53 deletions(-)
create mode 100644 civicrm/release-notes/5.61.3.md
diff --git a/civicrm.php b/civicrm.php
index 0fc732d65c..74e34845ae 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.61.2
+ * Version: 5.61.3
* 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.2');
+define('CIVICRM_PLUGIN_VERSION', '5.61.3');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Contribute/Form/ContributionBase.php b/civicrm/CRM/Contribute/Form/ContributionBase.php
index 1d41e1ae54..fb6f61e3e7 100644
--- a/civicrm/CRM/Contribute/Form/ContributionBase.php
+++ b/civicrm/CRM/Contribute/Form/ContributionBase.php
@@ -446,7 +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->assign('isShowMembershipBlock', $this->isShowMembershipBlock());
$this->set('membershipBlock', $this->getMembershipBlock());
// Handle PCP
@@ -1327,11 +1327,15 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
/**
* Should the membership block be displayed.
*
- * This should be shown when the price set is quick config and is a membership price set.
+ * This should be shown when a membership is available to purchase.
+ *
+ * It could be a quick config price set or a standard price set that extends
+ * CiviMember.
+ *
* @return bool
*/
- protected function isShowMembershipQuickConfigBlock(): bool {
- return CRM_Core_Component::isEnabled('CiviMember') && $this->getMembershipBlock() && $this->isQuickConfig();
+ protected function isShowMembershipBlock(): bool {
+ return CRM_Core_Component::isEnabled('CiviMember') && $this->getMembershipBlock();
}
/**
diff --git a/civicrm/CRM/Financial/BAO/PaymentProcessor.php b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
index 986adf5573..39ac6138a4 100644
--- a/civicrm/CRM/Financial/BAO/PaymentProcessor.php
+++ b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
@@ -307,6 +307,8 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
$fieldsToProvide = [
'id',
'name',
+ 'title',
+ 'frontend_title',
'payment_processor_type_id',
'user_name',
'password',
@@ -337,6 +339,8 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
$processors['values'][0] = [
'object' => new CRM_Core_Payment_Manual(),
'id' => 0,
+ 'frontend_title' => ts('Pay later'),
+ 'title' => ts('Pay later'),
'payment_processor_type_id' => 0,
// This shouldn't be required but there are still some processors hacked into core with nasty 'if's.
'payment_processor_type' => 'Manual',
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 30e6654ffd..901f86f472 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.61.2',
+ return array( 'version' => '5.61.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 61e5d5937e..f840381505 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.2</version>
+ <version>5.61.3</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 f463209ec9..127a8954c9 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.2</version>
+ <version>5.61.3</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 6e7eca950b..90699933b3 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.2</version>
+ <version>5.61.3</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 23ef406bfc..47c3fe2cf0 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.2</version>
+ <version>5.61.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 091d383e86..efccab2485 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.2</version>
+ <version>5.61.3</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 dd7c953c5c..e9848cff4e 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.2</version>
+ <version>5.61.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index a4ccdb1875..1130910cb8 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 6ec0c2e79a..63b49d032e 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.2</version>
+ <version>5.61.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 632f2961c9..02f3f171f7 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 132737d9e3..612739763e 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 672304495e..e1571daf02 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 180c8427c7..e9b861925b 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.2</version>
+ <version>5.61.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index a6c127b652..209213e7fe 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.2</version>
+ <version>5.61.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index e06fe1e018..20373b787b 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 8d51305e41..ca518de310 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.2</version>
+ <version>5.61.3</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 5fe955dcb3..4f1375942b 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.2</version>
+ <version>5.61.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 33888e32c5..fc54e96c8f 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.2</version>
+ <version>5.61.3</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 36c2d4b0dc..ccb681d2ca 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.2</version>
+ <version>5.61.3</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 6cb5f5bffb..42b70a9392 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index a4cd20258e..f2b321ffba 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index e0389fb017..5972717beb 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.2</version>
+ <version>5.61.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index dcd87dc961..f7b94e071d 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.2</version>
+ <version>5.61.3</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 55ab4ca7f6..728a2e6852 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.2</version>
+ <version>5.61.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index c3c4d2e8a7..0e4ac91ffb 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.3
+
+Released May 19, 2023
+
+- **[Synopsis](release-notes/5.61.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.61.3.md#bugs)**
+- **[Credits](release-notes/5.61.3.md#credits)**
+- **[Feedback](release-notes/5.61.3.md#feedback)**
+
## CiviCRM 5.61.2
Released May 8, 2023
diff --git a/civicrm/release-notes/5.61.3.md b/civicrm/release-notes/5.61.3.md
new file mode 100644
index 0000000000..4e7a283e55
--- /dev/null
+++ b/civicrm/release-notes/5.61.3.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.61.3
+
+Released May 19, 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_: Renewal checkbox does not appear on contribution pages (when using non-"quick config" forms) ([dev/core#4282](https://lab.civicrm.org/dev/core/-/issues/4282): [#26268](https://github.com/civicrm/civicrm-core/pull/26268))**
+* **_Payment Processing_: Warning about "frontend_title" ([#26267](https://github.com/civicrm/civicrm-core/pull/26267))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Klangsoft - David Reedy Jr; CiviCRM - Coleman
+Watts
+
+## <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 ed49f429fd..f7fce0a482 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.2';
+UPDATE civicrm_domain SET version = '5.61.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 7d6bafcf96..5af9ccb3f1 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.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.61.3',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 3a0c541a7e..e1d71b5d91 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 $isShowMembershipQuickConfigBlock && !$ccid}
+ {if $isShowMembershipBlock && !$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 fd70bbe249..848e2d73d7 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -7,9 +7,9 @@
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
-{if $isShowMembershipQuickConfigBlock}
+{if $context EQ "makeContribution"}
<div id="membership" class="crm-group membership-group">
- {if $context EQ "makeContribution"}
+
<div id="priceset">
<fieldset>
{if $renewal_mode}
@@ -61,7 +61,7 @@
<div class="display-block">
{include file="CRM/Price/Page/LineItem.tpl" context="Membership"}
</div>
- {/if}
+
</div>
{literal}
<script type="text/javascript">
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 6156998a3b..3e752bd94d 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26::getLoader();
+return ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 6387f47cca..0f53aae570 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 ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26
+class ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire44b9c719a70155244dfb6c35eb6d8e26($fileIdentifier, $file);
+ composerRequire73b45ac90f8eb93149474e39bdab5d75($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInit44b9c719a70155244dfb6c35eb6d8e26
* @param string $file
* @return void
*/
-function composerRequire44b9c719a70155244dfb6c35eb6d8e26($fileIdentifier, $file)
+function composerRequire73b45ac90f8eb93149474e39bdab5d75($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 2b7d690b14..3e280e15a5 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26
+class ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -729,11 +729,11 @@ class ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit44b9c719a70155244dfb6c35eb6d8e26::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 00551ead4f..928afd252d 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' => 'f87b1d41eb7420a6434b75f87dbcac32bb103f6b',
+ 'reference' => 'c5f2dd3d3656c353d83b69a56f7b49e956c3a5b3',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -43,7 +43,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'f87b1d41eb7420a6434b75f87dbcac32bb103f6b',
+ 'reference' => 'c5f2dd3d3656c353d83b69a56f7b49e956c3a5b3',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 6a6e403897..38f6d0e2fa 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.2</version_no>
+ <version_no>5.61.3</version_no>
</version>
--
GitLab