From d4f63d049ecbcb0d9d61e8d3dc047970f5b66c5d Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Tue, 24 Aug 2021 08:58:30 -0400
Subject: [PATCH] civicrm release 5.40.3
---
civicrm.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/ckeditor4/info.xml | 2 +-
.../ext/contributioncancelactions/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 +-
.../Api4/Action/OAuthSysToken/Refresh.php | 7 +-
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.40.2.md | 6 +-
civicrm/release-notes/5.40.3.md | 37 +++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
.../CRM/Contact/Form/Task/SMSCommon.tpl | 66 +++++++++----------
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 ++--
civicrm/vendor/composer/autoload_static.php | 12 ++--
civicrm/xml/version.xml | 2 +-
30 files changed, 125 insertions(+), 74 deletions(-)
create mode 100644 civicrm/release-notes/5.40.3.md
diff --git a/civicrm.php b/civicrm.php
index 3ab55e478d..25cace6037 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.40.2
+ * Version: 5.40.3
* Requires at least: 4.9
* Requires PHP: 7.2
* Author: CiviCRM LLC
@@ -54,7 +54,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: when it changes, will force Javascript & CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.40.2');
+define('CIVICRM_PLUGIN_VERSION', '5.40.3');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index a61430505d..efa82fb7f4 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.40.2',
+ return array( 'version' => '5.40.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index fc53011f20..c45682b9c8 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.40.2</version>
+ <version>5.40.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index d08f9f9e68..cfdfff3b11 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.40.2</version>
+ <version>5.40.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index cfdfa57f59..763dc9efa9 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.40.2</version>
+ <version>5.40.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index d58b763736..fc0e1ab9da 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.40.2</version>
+ <version>5.40.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index b1c0112892..2933f00a54 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.40.2</version>
+ <version>5.40.3</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index d1dd84749d..f1d15ff152 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.40.2</version>
+ <version>5.40.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.39</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 276b92043e..adce09ddf2 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.40.2</version>
+ <version>5.40.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.32</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 0734554973..0a10cb31c1 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.40.2</version>
+ <version>5.40.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 85552b180e..787cb0780b 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.40.2</version>
+ <version>5.40.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index e08a0593ed..f736cf49f6 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.40.2</version>
+ <version>5.40.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.30</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 79076cad56..2c96e5c8cf 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.40.2</version>
+ <version>5.40.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 203e63f167..9cb0d93772 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.40.2</version>
+ <version>5.40.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php b/civicrm/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php
index 043a83b5d2..5a1e4c523f 100644
--- a/civicrm/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php
+++ b/civicrm/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php
@@ -38,10 +38,15 @@ class Refresh extends BasicBatchAction {
private $syncFields = ['access_token', 'refresh_token', 'expires', 'token_type'];
private $writeFields = ['access_token', 'refresh_token', 'expires', 'token_type', 'raw'];
+ private $selectFields = ['id', 'client_id', 'access_token', 'refresh_token', 'expires', 'token_type', 'raw'];
private $providers = [];
public function __construct($entityName, $actionName) {
- parent::__construct($entityName, $actionName, '*');
+ parent::__construct($entityName, $actionName);
+ }
+
+ protected function getSelect() {
+ return $this->selectFields;
}
protected function doTask($row) {
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index ccc2cdd1e7..e6ea25d017 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.40.2</version>
+ <version>5.40.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 391f41927d..1d0fa68116 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.40.2</version>
+ <version>5.40.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 0be93c4207..dbeee75ed8 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.40.2</version>
+ <version>5.40.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 8a8e78490b..8907eeee80 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -14,7 +14,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-06</releaseDate>
- <version>5.40.2</version>
+ <version>5.40.3</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 8d0d618393..e904cef807 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.40.2</version>
+ <version>5.40.3</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 2420627341..bf9ec0185a 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.40.3
+
+Released August 23, 2021
+
+- **[Synopsis](release-notes/5.40.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.40.3.md#bugs)**
+- **[Credits](release-notes/5.40.3.md#credits)**
+- **[Feedback](release-notes/5.40.3.md#feedback)**
+
## CiviCRM 5.40.2
Released August 17, 2021
diff --git a/civicrm/release-notes/5.40.2.md b/civicrm/release-notes/5.40.2.md
index 4aa803551d..c773050a2c 100644
--- a/civicrm/release-notes/5.40.2.md
+++ b/civicrm/release-notes/5.40.2.md
@@ -21,7 +21,7 @@ Released August 17, 2021
## <a name="bugs"></a>Bugs resolved
* **_APIv3_: Fix performance regression when processing `Campaign`-affiliated data ([dev/core#2743](https://lab.civicrm.org/dev/core/-/issues/2743): [#21099](https://github.com/civicrm/civicrm-core/pull/21099), [#21143](https://github.com/civicrm/civicrm-core/pull/21143))**
-* **_CiviContribute_: setOverrideTotal() receives malformatted quantities ([#21107](https://github.com/civicrm/civicrm-core/pull/21107))**
+* **_CiviContribute_: Fix support for editing contribution amount with "," ([dev/core#2756](https://lab.civicrm.org/dev/core/-/issues/2756): [#21107](https://github.com/civicrm/civicrm-core/pull/21107))**
* **_CiviEvent, et al_: Fix loading of form validation utility ([#21124](https://github.com/civicrm/civicrm-core/pull/21124))**
* **_CiviMember_: Fix handling of free memberships ([dev/core#2749](https://lab.civicrm.org/dev/core/-/issues/2749): [#21100](https://github.com/civicrm/civicrm-core/pull/21100))**
* **_CiviMember_: Fix error in batch update ([#21151](https://github.com/civicrm/civicrm-core/pull/21151))**
@@ -34,8 +34,8 @@ This release was developed by the following authors and reviewers:
Wikimedia Foundation - Eileen McNaughton; timo.kabsch; SYSTOPIA Organisationsberatung -
Björn Endres; Megaphone Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee;
-Greenpeace Central and Eastern Europe - Patrick Figel; Dave D; Coop SymbioTIC - Mathieu
-Lutfy; CiviCRM - Coleman Watts, Tim Otten; Artful Robot - Rich Lott
+Greenpeace Central and Eastern Europe - Patrick Figel; Digitalcourage - Detlev Sieber; Dave D;
+Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Coleman Watts, Tim Otten; Artful Robot - Rich Lott
## <a name="feedback"></a>Feedback
diff --git a/civicrm/release-notes/5.40.3.md b/civicrm/release-notes/5.40.3.md
new file mode 100644
index 0000000000..eda07d457c
--- /dev/null
+++ b/civicrm/release-notes/5.40.3.md
@@ -0,0 +1,37 @@
+# CiviCRM 5.40.3
+
+Released August 23, 2021
+
+- **[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** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Scheduled Reminder_: Fix error when editing SMS-based reminders ([dev/core#2777](https://lab.civicrm.org/dev/core/-/issues/2777): [#21192](https://github.com/civicrm/civicrm-core/pull/21192))**
+* **_OAuth Client_: Fix error when refreshing OAuth tokens ([dev/core#2779](https://lab.civicrm.org/dev/core/-/issues/2779): [#21224](https://github.com/civicrm/civicrm-core/pull/21224))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Benjamin W; CiviCRM - Tim Otten; Dave D; Fuzion - Jitendra Purohit; JMA Consulting -
+Seamus Lee; Wikimedia Foundation - Eileen McNaughton
+
+## <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 e7d6e7886e..60c9411e70 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23954,4 +23954,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.40.2';
+UPDATE civicrm_domain SET version = '5.40.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 92b507bde9..b23dad755c 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2869,7 +2869,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.40.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.40.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/Contact/Form/Task/SMSCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
index 971e4e5e7f..b84c69f525 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
@@ -9,8 +9,6 @@
*}
{*common template for compose sms*}
-{crmScript file=bower_components/sms-counter/sms_counter.min.js region=html-header}
-
<div class="crm-accordion-wrapper crm-plaint_text_sms-accordion ">
<div class="crm-accordion-header">
{$form.sms_text_message.label}
@@ -47,41 +45,43 @@
{literal}
<script type="text/javascript">
{/literal}{if $max_sms_length}{literal}
-maxCharInfoDisplay();
+CRM.loadScript(CRM.config.resourceBase + 'bower_components/sms-counter/sms_counter.min.js').done(function () {
+ maxCharInfoDisplay();
-CRM.$('#sms_text_message').bind({
- change: function() {
- maxLengthMessage();
- },
- keyup: function() {
- maxCharInfoDisplay();
- }
-});
+ CRM.$('#sms_text_message').bind({
+ change: function() {
+ maxLengthMessage();
+ },
+ keyup: function() {
+ maxCharInfoDisplay();
+ }
+ });
-function maxLengthMessage()
-{
- var len = CRM.$('#sms_text_message').val().length;
- var maxLength = {/literal}{$max_sms_length}{literal};
- if (len > maxLength) {
- CRM.$('#sms_text_message').crmError({/literal}'{ts escape="js" 1=$max_sms_length}SMS body exceeding limit of %1 characters{/ts}'{literal});
- return false;
- }
-return true;
-}
+ function maxLengthMessage()
+ {
+ var len = CRM.$('#sms_text_message').val().length;
+ var maxLength = {/literal}{$max_sms_length}{literal};
+ if (len > maxLength) {
+ CRM.$('#sms_text_message').crmError({/literal}'{ts escape="js" 1=$max_sms_length}SMS body exceeding limit of %1 characters{/ts}'{literal});
+ return false;
+ }
+ return true;
+ }
-function maxCharInfoDisplay(){
- var maxLength = {/literal}{$max_sms_length}{literal};
- var enteredText = SmsCounter.count(CRM.$('#sms_text_message').val());
- var count = enteredText.length;
- var segments = enteredText.messages;
+ function maxCharInfoDisplay(){
+ var maxLength = {/literal}{$max_sms_length}{literal};
+ var enteredText = SmsCounter.count(CRM.$('#sms_text_message').val());
+ var count = enteredText.length;
+ var segments = enteredText.messages;
- if( count < 0 ) {
- CRM.$('#sms_text_message').val(CRM.$('#sms_text_message').val().substring(0, maxLength));
- count = 0;
- }
- var message = "{/literal}{$char_count_message}{literal}"
- CRM.$('#char-count-message').text(message.replace('%1', maxLength).replace('%2', count).replace('%3', segments));
-}
+ if( count < 0 ) {
+ CRM.$('#sms_text_message').val(CRM.$('#sms_text_message').val().substring(0, maxLength));
+ count = 0;
+ }
+ var message = "{/literal}{$char_count_message}{literal}"
+ CRM.$('#char-count-message').text(message.replace('%1', maxLength).replace('%2', count).replace('%3', segments));
+ }
+});
{/literal}{/if}{literal}
</script>
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 4f7c869e02..c6f842dd0d 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d::getLoader();
+return ComposerAutoloaderInit47aa25b517a223cfa6c95bd671b17c66::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index f6782d8ea1..4d662e2940 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 ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d
+class ComposerAutoloaderInit47aa25b517a223cfa6c95bd671b17c66
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit47aa25b517a223cfa6c95bd671b17c66', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit47aa25b517a223cfa6c95bd671b17c66', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit11bcd54cd52d03384afd5c451deeaa5d
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire11bcd54cd52d03384afd5c451deeaa5d($fileIdentifier, $file);
+ composerRequire47aa25b517a223cfa6c95bd671b17c66($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire11bcd54cd52d03384afd5c451deeaa5d($fileIdentifier, $file)
+function composerRequire47aa25b517a223cfa6c95bd671b17c66($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index e789a1d3fc..15344a85e7 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d
+class ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -572,11 +572,11 @@ class ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit11bcd54cd52d03384afd5c451deeaa5d::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit47aa25b517a223cfa6c95bd671b17c66::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 577a5427e8..4907745e01 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.40.2</version_no>
+ <version_no>5.40.3</version_no>
</version>
--
GitLab