diff --git a/civicrm.php b/civicrm.php
index 0fc732d65c9f870fdad234e362fbc9a1baf44bf1..74e34845aebfe31cfd8dbad97a977631088b6e37 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 1d41e1ae54cf9a67d98dc5ad075351558a109da7..fb6f61e3e719c77396cc32392cd14c70ce831216 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 986adf5573222904bcfc80d4e94d779b6beaa070..39ac6138a4a5a58dd98b29281e3fdaf49758a927 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 30e6654ffd51ff9038ee25003d20c7bec60803bc..901f86f4725ad8c3b42d3fee664bf65588445832 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 61e5d5937e22388f83e646a18787012b0ddf6ad4..f840381505a0a398993a56d680bba01be10e4e33 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 f463209ec9c1ce757bc3d1a9068def33342961e9..127a8954c96de870bd4112374fd10e0a34df87e0 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 6e7eca950bd8512450c4bbbe5ea4aa26ee5e68bd..90699933b374b14971436194e7a2a7bc45db9d54 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 23ef406bfc1b62691562a14fed06bd5eab933007..47c3fe2cf0328eaa1860a4e407b3ad1d94c41087 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 091d383e86f57dd7f9abd2e351f4fdf0bc163a98..efccab248514d30eae59d5260416873cde8e24c2 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 dd7c953c5cef361603b1980d4a3c240b1cb6358b..e9848cff4edbdc6358630a93362fe253dbcda1bf 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 a4ccdb18750c2e42d5460b09de15b74e255cda2c..1130910cb8927b4c971c6cf94a4cb89cd3bfe3c3 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 6ec0c2e79aef4a05627b5709b4fb32b5418bb6a4..63b49d032e8923132ee7c632821d8e111a3ccf28 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 632f2961c9502df72ab5cd7d6d90422535520d89..02f3f171f748f9a46590178f92eb09769238e306 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 132737d9e3eb20a2d7da204f9afbb7e12ba83b86..612739763eaecb22011658447a4eedd5c4c777f9 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 672304495ed4ad9e0bdab14e2cebf1e0219fb7ec..e1571daf0247a851144f0742edf3aab0e480a1dc 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 180c8427c783a6b83cad13646ec6aed68ce8fa84..e9b861925b77b28e30c633ca0741716214821671 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 a6c127b65221a4aeef7226fe8e5b25f6389d4018..209213e7fe6952dc528bb4bd7a20e2460ddf9ab6 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 e06fe1e018bbe7e231413df7c05f0c2e77845600..20373b787ba3dbd916ac11677e99a85a8cd12535 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 8d51305e414b6426bf131d569e22d16b79d33a66..ca518de310c7a699706372b0a6e3d3410dfff1b8 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 5fe955dcb304ca0e0e5209f47636b9818111c8b3..4f1375942b1dde324bda5fdedc026276641903e9 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 33888e32c59b600cb8c5569d28b52ff546efee77..fc54e96c8f691f5c0ddecedcdd4ed494fe5f4603 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 36c2d4b0dc31eb38621f2766fc45c496deaad74f..ccb681d2ca2daaa1a2d7d016da2f293b2e61e532 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 6cb5f5bffbb52778e9f1c24232e57f80b49efc2f..42b70a939292dcbd94c0e6b7fbe9e4586c121b95 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 a4cd20258eff112fb650e896cc65d8e6c78e6f62..f2b321ffba4f906ed3c00054f55b0d3055900dbc 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 e0389fb017dfec4b0b371553e8b54a155d308aef..5972717bebe245d6ee98070b9947d2854aad6202 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 dcd87dc96131634c7bf5c75cbb7fbb56a78c5e8d..f7b94e071df125e28eaa71a0a8d322f304ea925e 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 55ab4ca7f67fe954a2e42c53cec7397af61a3386..728a2e6852c3194604c8fab80c002d2b31c63ab2 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 c3c4d2e8a73345b6f30ec34b9a3603f10c72c6ec..0e4ac91ffb37eb0c93eb98eaa6642e48e761af19 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 0000000000000000000000000000000000000000..4e7a283e55f05c779a4a3e64fa1fabcf53a260cd
--- /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 ed49f429fd0e1dc8ee739791b8da07038dcab710..f7fce0a482f48027b974de7251c1ea2bb1362777 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 7d6bafcf96ea87ff0c0c2c2c6a3b801f72d08ee2..5af9ccb3f100d688c596182250a9e8b3a494f3a5 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 3a0c541a7e33f3b430d96b9177a65bfd02d0a3d8..e1d71b5d91814bedcc7f759b08f6bcc50c97243a 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 fd70bbe2495630e2227a7fa721a8054c833b0623..848e2d73d7b152bb73dc11771faa49451cfe2edf 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 6156998a3bdbcd2f183bb12acfd61c408905da4f..3e752bd94d6d17c4ea1b9835f9aa88dc6260460d 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 6387f47cca602b00b3fe232c6d6517c911d30550..0f53aae5709ba5ba86528559857179a128cd1ad4 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 2b7d690b147dccab6a12d431f428d52187b451ad..3e280e15a50e8d5ec35315670428a3f9250ef926 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 00551ead4f036445ea7ba3a9669daa18a72a1bd2..928afd252d187a31ee5e97044f04afe02a906273 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 6a6e403897d90140ef044a13b1b35883564c55c4..38f6d0e2faae33950a5badc6e6e2c8b2e3a88ff0 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>