From 22c46c851936ac5fceaa5ba3c78dcb780637e2ac Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Wed, 24 May 2023 07:07:12 -0400
Subject: [PATCH] civicrm release-5.61.4
---
civicrm.php | 4 +-
.../Smarty/plugins/prefilter.htxtFilter.php | 10 +++-
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.4.md | 41 +++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
.../Form/Contribution/MembershipBlock.tpl | 51 +++++++++----------
civicrm/templates/CRM/Mailing/MailingUI.hlp | 2 +-
civicrm/templates/CRM/SMS/Form/Group.hlp | 4 +-
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, 131 insertions(+), 76 deletions(-)
create mode 100644 civicrm/release-notes/5.61.4.md
diff --git a/civicrm.php b/civicrm.php
index 74e34845ae..321b0aef48 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.61.3
+ * Version: 5.61.4
* 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.3');
+define('CIVICRM_PLUGIN_VERSION', '5.61.4');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Core/Smarty/plugins/prefilter.htxtFilter.php b/civicrm/CRM/Core/Smarty/plugins/prefilter.htxtFilter.php
index 1a2a56a085..c731f68c6e 100644
--- a/civicrm/CRM/Core/Smarty/plugins/prefilter.htxtFilter.php
+++ b/civicrm/CRM/Core/Smarty/plugins/prefilter.htxtFilter.php
@@ -18,7 +18,15 @@ function smarty_prefilter_htxtFilter($tpl_source, &$smarty) {
$_htxts = 0;
$result = preg_replace_callback_array([
- '/\{htxt id=([\'\"][^\'\"]+[\'\"])/' => function ($m) use (&$htxts) {
+ '/\{htxt id=(\"[-\w]+\")[ }]/' => function ($m) use (&$htxts) {
+ $htxts++;
+ return sprintf('{if $id == %s}%s', $m[1], $m[0]);
+ },
+ '/\{htxt id=(\'[-\w]+\')[ }]/' => function ($m) use (&$htxts) {
+ $htxts++;
+ return sprintf('{if $id == %s}%s', $m[1], $m[0]);
+ },
+ '/\{htxt id=(\$\w+)[ }]/' => function ($m) use (&$htxts) {
$htxts++;
return sprintf('{if $id == %s}%s', $m[1], $m[0]);
},
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 901f86f472..09c36fe655 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.61.3',
+ return array( 'version' => '5.61.4',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index f840381505..e522e2a195 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.3</version>
+ <version>5.61.4</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 127a8954c9..22eee5c06b 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.3</version>
+ <version>5.61.4</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 90699933b3..be1ee274c4 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.3</version>
+ <version>5.61.4</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 47c3fe2cf0..bc7e64d156 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.3</version>
+ <version>5.61.4</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index efccab2485..6fc3447036 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.3</version>
+ <version>5.61.4</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 e9848cff4e..4c171e8e27 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.3</version>
+ <version>5.61.4</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index 1130910cb8..3f25801547 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 63b49d032e..232b63705b 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.3</version>
+ <version>5.61.4</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 02f3f171f7..2b6239b2b8 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 612739763e..5dc225e9eb 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index e1571daf02..ab8ebe7ce0 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index e9b861925b..206c43fcd5 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.3</version>
+ <version>5.61.4</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 209213e7fe..06dc29866a 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.3</version>
+ <version>5.61.4</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 20373b787b..64eeb8c884 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index ca518de310..735d5eb8ec 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.3</version>
+ <version>5.61.4</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 4f1375942b..8ee812828c 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.3</version>
+ <version>5.61.4</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index fc54e96c8f..be30640c23 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.3</version>
+ <version>5.61.4</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 ccb681d2ca..0aa47bbe26 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.3</version>
+ <version>5.61.4</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 42b70a9392..659b8fb14f 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index f2b321ffba..ba879cabe8 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.61</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 5972717beb..7143cd72e3 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.3</version>
+ <version>5.61.4</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index f7b94e071d..bdda7d4b18 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.3</version>
+ <version>5.61.4</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:required</tag>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 728a2e6852..fc9f64abca 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.3</version>
+ <version>5.61.4</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 0e4ac91ffb..f064be75bf 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.4
+
+Released May 24, 2023
+
+- **[Synopsis](release-notes/5.61.4.md#synopsis)**
+- **[Bugs resolved](release-notes/5.61.4.md#bugs)**
+- **[Credits](release-notes/5.61.4.md#credits)**
+- **[Feedback](release-notes/5.61.4.md#feedback)**
+
## CiviCRM 5.61.3
Released May 19, 2023
diff --git a/civicrm/release-notes/5.61.4.md b/civicrm/release-notes/5.61.4.md
new file mode 100644
index 0000000000..a06683522a
--- /dev/null
+++ b/civicrm/release-notes/5.61.4.md
@@ -0,0 +1,41 @@
+# CiviCRM 5.61.4
+
+Released May 24, 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_: Fix erroneous layout on "Contribution Page" ([dev/core#4310](https://lab.civicrm.org/dev/core/-/issues/4310): [#26320](https://github.com/civicrm/civicrm-core/pull/26320))**
+* **_CiviSMS/CiviMail_: Fix error processing help text ([dev/core#4306](https://lab.civicrm.org/dev/core/-/issues/4306): [#26010](https://github.com/civicrm/civicrm-core/pull/26010))**
+* **_Custom Data_: Fix error processing help text ([dev/core#4303](https://lab.civicrm.org/dev/core/-/issues/4303): [#26298](https://github.com/civicrm/civicrm-core/pull/26298))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wildsight - Lars Sanders-Green; wil_SRQ; Wikimedia Foundation - Eileen McNaughton;
+Megaphone Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee;
+jhungerford; Dave D; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; CiviCRM - Tim
+Otten, Coleman Watts; Agileware - Justin Freeman, Francis Whittle
+
+## <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 f7fce0a482..66713b5ab8 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.3';
+UPDATE civicrm_domain SET version = '5.61.4';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 5af9ccb3f1..7d6b09ee81 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.3',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.61.4',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/MembershipBlock.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 848e2d73d7..b77d0ecd70 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -7,9 +7,8 @@
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
-{if $context EQ "makeContribution"}
- <div id="membership" class="crm-group membership-group">
-
+<div id="membership" class="crm-group membership-group">
+ {if $context EQ "makeContribution"}
<div id="priceset">
<fieldset>
{if $renewal_mode}
@@ -53,6 +52,27 @@
{include file="CRM/Price/Form/PriceSet.tpl" extends="Membership"}
</fieldset>
</div>
+ {literal}
+ <script type="text/javascript">
+ CRM.$(function($) {
+ //if price set is set we use below below code to show for showing auto renew
+ var autoRenewOption = {/literal}'{$autoRenewOption}'{literal};
+ var autoRenew = $("#auto_renew_section");
+ var autoRenewCheckbox = $("#auto_renew");
+ var forceRenew = $("#force_renew");
+ autoRenew.hide();
+ forceRenew.hide();
+ if ( autoRenewOption == 1 ) {
+ autoRenew.show();
+ } else if ( autoRenewOption == 2 ) {
+ autoRenewCheckbox.prop('checked', true );
+ autoRenewCheckbox.attr( 'readonly', true );
+ autoRenew.hide();
+ forceRenew.show();
+ }
+ });
+ </script>
+ {/literal}
{elseif $lineItem and $priceSetID AND !$is_quick_config}
{assign var="totalAmount" value=$amount}
<div class="header-dark">
@@ -61,29 +81,6 @@
<div class="display-block">
{include file="CRM/Price/Page/LineItem.tpl" context="Membership"}
</div>
-
- </div>
-{literal}
- <script type="text/javascript">
- CRM.$(function($) {
- //if price set is set we use below below code to show for showing auto renew
- var autoRenewOption = {/literal}'{$autoRenewOption}'{literal};
- var autoRenew = $("#auto_renew_section");
- var autoRenewCheckbox = $("#auto_renew");
- var forceRenew = $("#force_renew");
- autoRenew.hide();
- forceRenew.hide();
- if ( autoRenewOption == 1 ) {
- autoRenew.show();
- } else if ( autoRenewOption == 2 ) {
- autoRenewCheckbox.prop('checked', true );
- autoRenewCheckbox.attr( 'readonly', true );
- autoRenew.hide();
- forceRenew.show();
- }
- });
- </script>
-{/literal}
{elseif $membershipBlock AND !$is_quick_config}
<div id="membership" class="crm-group membership-group">
{if $context EQ "makeContribution"}
@@ -134,7 +131,7 @@
</div>
{/if}{* membership block end here *}
-
+</div>
{if $membershipBlock AND $is_quick_config}
{if $context neq "makeContribution" }
<div class="header-dark">
diff --git a/civicrm/templates/CRM/Mailing/MailingUI.hlp b/civicrm/templates/CRM/Mailing/MailingUI.hlp
index c8f4b148f8..f3c4038e23 100644
--- a/civicrm/templates/CRM/Mailing/MailingUI.hlp
+++ b/civicrm/templates/CRM/Mailing/MailingUI.hlp
@@ -15,7 +15,7 @@
</p>
{/htxt}
-{htxt id ="from_email"}
+{htxt id="from_email"}
<p>{ts}Select the "FROM" Email Address for this mailing from the dropdown list. Available email addresses are configurable by users with Administer CiviCRM permission. EXAMPLE: "Client Services" <clientservices@example.org>{/ts}</p>
{if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
{capture assign="fromConfig"}{crmURL p="civicrm/admin/options/from_email_address" q="reset=1"}{/capture}
diff --git a/civicrm/templates/CRM/SMS/Form/Group.hlp b/civicrm/templates/CRM/SMS/Form/Group.hlp
index 1fc6605f45..99a8e5fc63 100644
--- a/civicrm/templates/CRM/SMS/Form/Group.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Group.hlp
@@ -47,10 +47,10 @@
<p>{ts}If you have sent other Mass SMS - you can additionally Include (or Exclude) contacts who received those Mass SMS. CiviCRM will eliminate any duplications so that contacts who are in an Included Group AND were recipients of an Included Mailing will only be sent one copy of this SMS.{/ts}</p>
{/htxt}
-{htxt id ="id-sms_provider-title"}
+{htxt id="id-sms_provider-title"}
{ts}SMS Provider{/ts}
{/htxt}
-{htxt id ="id-sms_provider"}
+{htxt id="id-sms_provider"}
<p>{ts}Select the SMS provider for this mass message from the dropdown list.{/ts}</p>
{if $params.isAdmin}
{capture assign="fromConfig"}{crmURL p="civicrm/admin/sms/provider" q="reset=1"}{/capture}
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 3e752bd94d..792f5ff830 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75::getLoader();
+return ComposerAutoloaderInit8093464806c4e4ce3fd66c6dce2b3e1c::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 0f53aae570..2135b3d219 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 ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75
+class ComposerAutoloaderInit8093464806c4e4ce3fd66c6dce2b3e1c
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit8093464806c4e4ce3fd66c6dce2b3e1c', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit8093464806c4e4ce3fd66c6dce2b3e1c', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire73b45ac90f8eb93149474e39bdab5d75($fileIdentifier, $file);
+ composerRequire8093464806c4e4ce3fd66c6dce2b3e1c($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInit73b45ac90f8eb93149474e39bdab5d75
* @param string $file
* @return void
*/
-function composerRequire73b45ac90f8eb93149474e39bdab5d75($fileIdentifier, $file)
+function composerRequire8093464806c4e4ce3fd66c6dce2b3e1c($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 3e280e15a5..6de71e2d77 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75
+class ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -729,11 +729,11 @@ class ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit73b45ac90f8eb93149474e39bdab5d75::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit8093464806c4e4ce3fd66c6dce2b3e1c::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 928afd252d..aad1bac091 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' => 'c5f2dd3d3656c353d83b69a56f7b49e956c3a5b3',
+ 'reference' => '8f6a77f8002176cffad9211a21da9dee65e6dd0c',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -43,7 +43,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'c5f2dd3d3656c353d83b69a56f7b49e956c3a5b3',
+ 'reference' => '8f6a77f8002176cffad9211a21da9dee65e6dd0c',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 38f6d0e2fa..c0e233220c 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.3</version_no>
+ <version_no>5.61.4</version_no>
</version>
--
GitLab