diff --git a/civicrm.php b/civicrm.php
index 7ecdb17bee79199cff18492b1e4f5fcae9a0648d..6df4ca45844a120a7dc5620d73b7a7806cb14e7d 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.56.0
+ * Version: 5.56.1
* Requires at least: 4.9
* Requires PHP: 7.2
* 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.56.0');
+define('CIVICRM_PLUGIN_VERSION', '5.56.1');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Batch/Form/Batch.php b/civicrm/CRM/Batch/Form/Batch.php
index 3f4b34af52491a669555909741ea23a0c3c2805b..2f53b43f6ceff6aa2e351b31d6165ef42a9c6540 100644
--- a/civicrm/CRM/Batch/Form/Batch.php
+++ b/civicrm/CRM/Batch/Form/Batch.php
@@ -18,6 +18,13 @@ class CRM_Batch_Form_Batch extends CRM_Admin_Form {
protected $submittableMoneyFields = ['total'];
+ /**
+ * Explicitly declare the entity api name.
+ */
+ public function getDefaultEntity() {
+ return 'Batch';
+ }
+
/**
* PreProcess function.
*/
diff --git a/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index 744742bceda93a26db6a29e01ed48f4f52c8d4fd..2f54ac955400d86eeeef5bcc8e2a9e71fb5341ff 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -185,7 +185,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
* @return array
*/
public function getRequiredFieldsForMatch(): array {
- return [['id'], ['invoice_id'], ['trxn_id']];
+ return [['contribution_id'], ['invoice_id'], ['trxn_id']];
}
/**
diff --git a/civicrm/CRM/Financial/BAO/Order.php b/civicrm/CRM/Financial/BAO/Order.php
index a2ae54e8c38f1bacc672b05a5fbf8e6fd2866957..f1ed6c04da2fe1d01a3e0504de3f2c146279e1df 100644
--- a/civicrm/CRM/Financial/BAO/Order.php
+++ b/civicrm/CRM/Financial/BAO/Order.php
@@ -838,7 +838,10 @@ class CRM_Financial_BAO_Order {
// Set the price set ID from the first line item (we need to set this here
// to prevent a loop later when we retrieve the price field metadata to
// set the 'title' (as accessed from workflow message templates).
- $this->setPriceSetID($lineItems[0]['price_field_id.price_set_id']);
+ // Contributions *should* all have line items, but historically, imports did not create them.
+ if ($lineItems) {
+ $this->setPriceSetID($lineItems[0]['price_field_id.price_set_id']);
+ }
}
else {
foreach ($this->getPriceOptions() as $fieldID => $valueID) {
diff --git a/civicrm/CRM/Price/BAO/PriceField.php b/civicrm/CRM/Price/BAO/PriceField.php
index 05821e18f9788d9854a5d24f3aad81de7c9f8be8..163f553eab37158a2d1b47587300d4f5b1cbd4bf 100644
--- a/civicrm/CRM/Price/BAO/PriceField.php
+++ b/civicrm/CRM/Price/BAO/PriceField.php
@@ -382,7 +382,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
foreach ($customOption as $opId => $opt) {
$preHelpText = $postHelpText = '';
- $opt['label'] = '<span class="crm-price-amount-label">' . $opt['label'] . '</span>';
+ $opt['label'] = !empty($opt['label']) ? '<span class="crm-price-amount-label">' . $opt['label'] . '</span>' : '';
if (!empty($opt['help_pre'])) {
$preHelpText = '<span class="crm-price-amount-help-pre description">' . $opt['help_pre'] . '</span><span class="crm-price-amount-help-pre-separator">: </span>';
}
@@ -567,7 +567,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
$max_value = CRM_Utils_Array::value('max_value', $opt, '');
$preHelpText = $postHelpText = '';
- $opt['label'] = '<span class="crm-price-amount-label">' . $opt['label'] . '</span>';
+ $opt['label'] = !empty($opt['label']) ? '<span class="crm-price-amount-label">' . $opt['label'] . '</span>' : '';
if (!empty($opt['help_pre'])) {
$preHelpText = '<span class="crm-price-amount-help-pre description">' . $opt['help_pre'] . '</span><span class="crm-price-amount-help-pre-separator">: </span>';
}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 2b31db3ed052f067356fc707cc2f077b9e07490c..bd8442f8934549ed601795ac0dd770e3bdb33a22 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.56.0',
+ return array( 'version' => '5.56.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 316e68096307ae9f0bf779e88d93b741cc227542..7b94223e2d93bbbd47acb16021c2cdc62b9c9458 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.56.0</version>
+ <version>5.56.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 287efb7cd6cd2cc8195ec477ec13e1a6aa307a37..c420186503fc367ae391651584a6856bf6eee554 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.56.0</version>
+ <version>5.56.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 0f531f26c2cb2ddee224b87b5f88e4d8b7b1d66d..6739fe670842fe7876fa0a0b89c9e8fafe51289b 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.56.0</version>
+ <version>5.56.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index 60527abd2f6a9f6cbac2f7705a509ed88dcbd7f1..fe19224e442cdc475ac730cc22227732adf9198c 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.56.0</version>
+ <version>5.56.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 79b8055e3a21b2e55de7c3545d68336599010c0f..0cd57eee16546c2c5604e9b0be169b11ed826e08 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index 63d4aa2e0c8a19ce7afce2ff26f3434160adfc73..ef781d289d9dab649cb9f0a671b16f832cd8ddb9 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.56.0</version>
+ <version>5.56.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index fd5d62ae819221ad60a979228664786dba44e9c0..cfc930b842ef8dd3acf77bf84632467d2204b8e8 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml
index 10724995d86ebb2e183d2ad35ba27de65eddac16..a4f34433104d892fb74e1a112b6161734bdfb042 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.56.0</version>
+ <version>5.56.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index ff502129bf14f8c57ae8c4e677b4f0dce5a7fd1c..3571d1a11782c2e651d3df1435a31933426d48a0 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index 5404e43568907c6c2d805d7c247a6639bb0d3915..4a80c3bd482a91480448da00e78262ed64b78f3b 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml
index 2da131cb97108ee977b17f4110bd309828e4b8ef..8fe1b58511a0fccf3d23e3f7be49ddfe9b7e8f1b 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 3a455d5c87a7a6e55a1275a514bb937593181538..0144f5b8d9ea53b49c3df1c98db4ec9bcf6c1b2b 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.56.0</version>
+ <version>5.56.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 05f228bffda936af46ecb3e987b7f60f66423e0f..f8c0503fe09445cf4f86408b60702fedadba34e8 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.56.0</version>
+ <version>5.56.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 504b6c1909a35f192e8725446398967f3c2730fe..277e7c917d82d38b00ae76ef922c3a69c226ceef 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 9a9706e48817a4f634303aeb1472843e43d1bf8f..29a8808332694f537a427992efbfa62fe4383abe 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<comments>
FlexMailer is an email delivery engine which replaces the internal guts
diff --git a/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php b/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php
index 63a14a0955e03dfdca05cbb25e9fa1f6caca0404..1fdea53e8b5a0f0edfa7a14822c2eb3ff4f4d9e3 100644
--- a/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php
+++ b/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php
@@ -37,7 +37,7 @@ class TextClickTracker implements ClickTrackerInterface {
};
// Find any HTTP(S) URLs in the text.
// return preg_replace_callback('/\b(?:(?:https?):\/\/|www\.|ftp\.)[-A-Z0-9+&@#\/%=~_|$?!:,.]*[A-Z0-9+&@#\/%=~_|$]/i', $callback, $tex
- return preg_replace_callback('/\b(?:(?:https?):\/\/)[\w+&@#\/%=~_|$?!:,.{}\[\];]*[\w+&@#\/%=~_|${}\[\];]/iu',
+ return preg_replace_callback('/\b(?:(?:https?):\/\/)[\w+&@#\/%=~_|$?!:,.{}\[\];\-]*[\w+&@#\/%=~_|${}\[\];\-]/iu',
$callback, $text);
}
diff --git a/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTracker/TextClickTrackerTest.php b/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTracker/TextClickTrackerTest.php
index 64f8b7f8c08d7398e354ee0ba9a61172bd0202cf..ddac3ba63f304b8fdc91832526cccb6ba3d2f318 100644
--- a/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTracker/TextClickTrackerTest.php
+++ b/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTracker/TextClickTrackerTest.php
@@ -70,7 +70,11 @@ class TextClickTrackerTest extends \CiviUnitTestCase {
'<p><a href="http://example.com/1">First</a><a href="http://example.com/2">Second</a><a href=\'http://example.com/3\'>Third</a><a href="http://example.com/4">Fourth</a></p>',
'<p><a href="tracking(http://example.com/1)" rel=\'nofollow\'>First</a><a href="tracking(http://example.com/2)" rel=\'nofollow\'>Second</a><a href=\'tracking(http://example.com/3)\' rel=\'nofollow\'>Third</a><a href="tracking(http://example.com/4)" rel=\'nofollow\'>Fourth</a></p>',
];
-
+ $exs[] = [
+ // Messy looking URL, including hyphens
+ '<p><a href=\'https://sub.example-url.com/foo-bar.php?whiz=%2Fbang%2F&pie[fruit]=apple-pie\'>Foo</a></p>',
+ '<p><a href=\'tracking(https://sub.example-url.com/foo-bar.php?whiz=%2Fbang%2F&pie[fruit]=apple-pie)\' rel=\'nofollow\'>Foo</a></p>',
+ ];
return $exs;
}
diff --git a/civicrm/ext/greenwich/info.xml b/civicrm/ext/greenwich/info.xml
index 2e3fb09cc3f169ee278123b4219c824a2ff7e5ca..a488452ca18c38367de86983fb42492040e69f72 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.56.0</version>
+ <version>5.56.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 69d3eb62d65fb4be880d903dcfbe7d69a87a559c..127a022c69a0cef00bd4dcbb07a96cddc89fdb2d 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.56.0</version>
+ <version>5.56.1</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 24194a08ed4c0dadb033e58b59f764ff30164763..77b9f20b8bae781398d3332d9c71f33cb9579cad 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.56.0</version>
+ <version>5.56.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index f6509954f9ae470795276b8549519c3bcd8a69b3..c23d4216e6c244c22674e600788719b46f01035b 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index b3fa6ed74d66504b882270067ef199bc908bcea0..43e76225f33f9dee7fd565c0eaa24d5ef34ed840 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index a339590902e06d5f0efe5f4390c9d0f290706d67..8bbe13c08df8f54ee412c908b3cfea86e21a7998 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.56.0</version>
+ <version>5.56.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js b/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js
index 1669081dcbd747b9c46f1ede12777bfffb4e9329..a4c6595e765620029c975fffd9dc7fd2b2bed0e4 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js
@@ -408,7 +408,10 @@
_.each(results, function(fields, entityName) {
var entity = getEntity(entityName);
_.each(fields, function(options, fieldName) {
- _.find(entity.fields, {name: fieldName}).options = options;
+ var field = _.find(entity.fields, {name: fieldName});
+ if (field) {
+ field.options = options;
+ }
});
entity.optionsLoaded = true;
});
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index ba5d3221127bffd3fe4d1f6985fd92bb3e16be0f..147b099107919f8767ad5ac9cedbded334a882c5 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.56.0</version>
+ <version>5.56.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.56</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index ff8c530e9dda27a7f6d47998d34274aa5963df01..e5e67e56106e5b13571f429732db5858f5486d24 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.56.0</version>
+ <version>5.56.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 6bd21b36ac14f43843aec1db4c466792a2a20da5..98d893b96cf761fb94e0b65dfbe4f4cded153599 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.56.1
+
+Released December 20, 2022
+
+- **[Synopsis](release-notes/5.56.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.56.1.md#bugs)**
+- **[Credits](release-notes/5.56.1.md#credits)**
+- **[Feedback](release-notes/5.56.1.md#feedback)**
+
## CiviCRM 5.56.0
Released December 7, 2022
diff --git a/civicrm/release-notes/5.56.1.md b/civicrm/release-notes/5.56.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..c9c287ef89cecdeea96c1996106e96b798b71237
--- /dev/null
+++ b/civicrm/release-notes/5.56.1.md
@@ -0,0 +1,43 @@
+# CiviCRM 5.56.1
+
+Released December 20, 2022
+
+- **[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
+
+* **_CiviAccounts_: Closing a batch generates Javascript error (if authx is enabled) ([dev/core#3960](https://lab.civicrm.org/dev/core/-/issues/3960): [#25129](https://github.com/civicrm/civicrm-core/pull/25129))**
+* **_CiviAccounts_: "New Batch" page does not load ([dev/core#4036](https://lab.civicrm.org/dev/core/-/issues/4036): [#25189](https://github.com/civicrm/civicrm-core/pull/25189))**
+* **_CiviContribute_: Crash when displaying a contribution without any line-items ([dev/core#4027](https://lab.civicrm.org/dev/core/-/issues/4027): [#25145](https://github.com/civicrm/civicrm-core/pull/25145))**
+* **_CiviContribute_: Contribution amount sometimes displays extraneous dash ([#25033](https://github.com/civicrm/civicrm-core/pull/25033))**
+* **_CiviContribute_: Import error when using "update" mode ([dev/core#4038](https://lab.civicrm.org/dev/core/-/issues/4038): [#25204](https://github.com/civicrm/civicrm-core/pull/25204))**
+* **_Flexmailer_: Tracked URLs with hyphens do not work ([#25149](https://github.com/civicrm/civicrm-core/pull/25149))**
+* **_SearchKit_: Console error when loading options ([#25198](https://github.com/civicrm/civicrm-core/pull/25198))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wildsight - Lars Sanders-Green; Wikimedia Foundation - Eileen McNaughton; Third Sector
+Design - Kurund Jalmi; Megaphone Technology Consulting - Jon Goldberg; JMA Consulting -
+Seamus Lee; Dave D; CiviDesk - Yashodha Chaku; CiviCRM - Coleman Watts, Tim Otten
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 752fe4b5c98c7207adbfc985884d5f1fa6e3e998..81b056976490811d5153e69d588beaea00a04f8e 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23654,4 +23654,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.56.0';
+UPDATE civicrm_domain SET version = '5.56.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 172df3a46614016ad5ca05dd214aeb140e33a592..57171780b6cbc2b445372404dba0c1374c029f5e 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -3038,7 +3038,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.56.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.56.1',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/Financial/Form/Search.tpl b/civicrm/templates/CRM/Financial/Form/Search.tpl
index 53301668cf952f5168fd55c40180d7ce79e5f2d5..54c29a0b3ee951e003005122fb34da000dfa2a66 100644
--- a/civicrm/templates/CRM/Financial/Form/Search.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Search.tpl
@@ -218,7 +218,7 @@ CRM.$(function($) {
function saveRecords(records, op) {
var postUrl = CRM.url('civicrm/ajax/rest', 'className=CRM_Financial_Page_AJAX&fnName=assignRemove');
//post request and get response
- $.post(postUrl, {records: records, recordBAO: 'CRM_Batch_BAO_Batch', op: op, key: {/literal}"{crmKey name='civicrm/ajax/ar'}"{literal}},
+ $.post(postUrl, {records: records, recordBAO: 'CRM_Batch_BAO_Batch', op: op},
function(response) {
//this is custom status set when record update success.
if (response.status == 'record-updated-success') {
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index b98249889f95152cb0073087a6011778761d8c0d..65a3e5aaccc83369b1b5cd075812b489619691af 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d::getLoader();
+return ComposerAutoloaderInit740844413d66040dc31b51396d7da1ec::getLoader();
diff --git a/civicrm/vendor/composer/autoload_psr4.php b/civicrm/vendor/composer/autoload_psr4.php
index 707471bcbdd481a51a2d5565f550507856f1ae1d..b1c258842f92b4460cca4f7ea4500e379df77a2f 100644
--- a/civicrm/vendor/composer/autoload_psr4.php
+++ b/civicrm/vendor/composer/autoload_psr4.php
@@ -51,7 +51,7 @@ return array(
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
'MJS\\TopSort\\Tests\\' => array($vendorDir . '/marcj/topsort/tests/Tests'),
'MJS\\TopSort\\' => array($vendorDir . '/marcj/topsort/src'),
- 'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-client/src', $vendorDir . '/league/oauth2-google/src'),
+ 'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-google/src', $vendorDir . '/league/oauth2-client/src'),
'League\\Csv\\' => array($vendorDir . '/league/csv/src'),
'LastCall\\DownloadsPlugin\\' => array($vendorDir . '/civicrm/composer-downloads-plugin/src'),
'Laminas\\ZendFrameworkBridge\\' => array($vendorDir . '/laminas/laminas-zendframework-bridge/src'),
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 032c509655743eaad88b97a2594d42aceac36979..b073e7dc53c560dd6d92ed745327fce37a24b01b 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 ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d
+class ComposerAutoloaderInit740844413d66040dc31b51396d7da1ec
{
private static $loader;
@@ -24,9 +24,9 @@ class ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit740844413d66040dc31b51396d7da1ec', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit740844413d66040dc31b51396d7da1ec', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit003bc5bfffa29651294b88def978eb7d::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit740844413d66040dc31b51396d7da1ec::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -57,12 +57,12 @@ class ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit003bc5bfffa29651294b88def978eb7d::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit740844413d66040dc31b51396d7da1ec::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire003bc5bfffa29651294b88def978eb7d($fileIdentifier, $file);
+ composerRequire740844413d66040dc31b51396d7da1ec($fileIdentifier, $file);
}
return $loader;
@@ -74,7 +74,7 @@ class ComposerAutoloaderInit003bc5bfffa29651294b88def978eb7d
* @param string $file
* @return void
*/
-function composerRequire003bc5bfffa29651294b88def978eb7d($fileIdentifier, $file)
+function composerRequire740844413d66040dc31b51396d7da1ec($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 a8e12f75e221f6e05151e642d57c74c5767bff0a..8c3d22b6e1beaa6bc2621e550f75efc4a5d5fa07 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit003bc5bfffa29651294b88def978eb7d
+class ComposerStaticInit740844413d66040dc31b51396d7da1ec
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -393,8 +393,8 @@ class ComposerStaticInit003bc5bfffa29651294b88def978eb7d
),
'League\\OAuth2\\Client\\' =>
array (
- 0 => __DIR__ . '/..' . '/league/oauth2-client/src',
- 1 => __DIR__ . '/..' . '/league/oauth2-google/src',
+ 0 => __DIR__ . '/..' . '/league/oauth2-google/src',
+ 1 => __DIR__ . '/..' . '/league/oauth2-client/src',
),
'League\\Csv\\' =>
array (
@@ -738,11 +738,11 @@ class ComposerStaticInit003bc5bfffa29651294b88def978eb7d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit003bc5bfffa29651294b88def978eb7d::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit003bc5bfffa29651294b88def978eb7d::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit003bc5bfffa29651294b88def978eb7d::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit003bc5bfffa29651294b88def978eb7d::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit003bc5bfffa29651294b88def978eb7d::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit740844413d66040dc31b51396d7da1ec::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit740844413d66040dc31b51396d7da1ec::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit740844413d66040dc31b51396d7da1ec::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit740844413d66040dc31b51396d7da1ec::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit740844413d66040dc31b51396d7da1ec::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/include_paths.php b/civicrm/vendor/composer/include_paths.php
index 39079afea83fbea16881456f999ed080c12e6901..189ce0e9b6cf55031ce76c58174cb9f3eb050687 100644
--- a/civicrm/vendor/composer/include_paths.php
+++ b/civicrm/vendor/composer/include_paths.php
@@ -12,10 +12,10 @@ return array(
$vendorDir . '/pear/console_getopt',
$vendorDir . '/pear/pear-core-minimal/src',
$vendorDir . '/pear/db',
+ $vendorDir . '/pear/log',
$vendorDir . '/pear/mail',
$vendorDir . '/pear/mail_mime',
$vendorDir . '/pear/net_socket',
- $vendorDir . '/pear/log',
$vendorDir . '/pear/net_smtp',
$vendorDir . '/pear/validate_finance_creditcard',
);
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index 7bfc936fbc171fed1b9211ea5084eb485a51ea6d..ffe9b9c77e442bed403b603b4d56cfffaceb3976 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' => '9c30653bc41a78a16ba8e2416eb76b89f1958554',
+ 'reference' => '9ea8368ec4acaedf95fe22106dc975fcbb78a744',
'name' => 'civicrm/civicrm-core',
'dev' => true,
),
@@ -61,7 +61,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '9c30653bc41a78a16ba8e2416eb76b89f1958554',
+ 'reference' => '9ea8368ec4acaedf95fe22106dc975fcbb78a744',
'dev_requirement' => false,
),
'civicrm/civicrm-cxn-rpc' => array(
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index e3b21b441030198fbf4d2c008a139067e10e87b4..e597e37996ec7dff7718237b09fa1b0f514c8e66 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.56.0</version_no>
+ <version_no>5.56.1</version_no>
</version>