civicrm release-5.46.1

civicrm.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: CiviCRM
  * Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.46.0
+ * Version: 5.46.1
  * 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.46.0');
+define('CIVICRM_PLUGIN_VERSION', '5.46.1');
 
 // Store reference to this file.
 if (!defined('CIVICRM_PLUGIN_FILE')) {

civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php

@@ -25,9 +25,17 @@
  *
  * @return string
  *   formatted monetary amount
- *
- * @throws \CRM_Core_Exception
  */
 function smarty_modifier_crmMoney($amount, ?string $currency = NULL): string {
-  return Civi::format()->money($amount, $currency);
+  try {
+    return Civi::format()->money($amount, $currency);
+  }
+  catch (CRM_Core_Exception $e) {
+    // @todo escalate this to a deprecation notice. It turns out to be depressingly
+    // common for us to double process amount strings - if they are > 1000 then
+    // they wind up throwing an exception in the money function.
+    // It would be more correct to format in the smarty layer, only.
+    Civi::log()->warning('Invalid amount passed in as money - {money}', ['money' => $amount]);
+    return $amount;
+  }
 }

civicrm/CRM/Export/BAO/ExportProcessor.php

@@ -1464,6 +1464,16 @@ class CRM_Export_BAO_ExportProcessor {
 
         case CRM_Utils_Type::T_STRING:
           if (isset($fieldSpec['maxlength'])) {
+            // A localized string for the preferred_mail_format does not fit
+            // into the varchar(8) field.
+            // @see https://lab.civicrm.org/dev/core/-/issues/2645
+            switch ($fieldName) {
+              case 'preferred_mail_format':
+                return "`$fieldName` text(16)";
+
+              default:
+                return "`$fieldName` varchar({$fieldSpec['maxlength']})";
+            }
           }
           $dataType = $fieldSpec['data_type'] ?? '';
           // set the sql columns for custom data

civicrm/CRM/Utils/Check/Component/DedupeRules.php

@@ -22,7 +22,7 @@ class CRM_Utils_Check_Component_DedupeRules extends CRM_Utils_Check_Component {
    * @return string[]
    */
   private static function getContactTypesForRule($used) {
-    $dedupeRules = \Civi\Api4\DedupeRuleGroup::get()
+    $dedupeRules = \Civi\Api4\DedupeRuleGroup::get(FALSE)
       ->addSelect('contact_type')
       ->addGroupBy('contact_type')
       ->addWhere('used', '=', $used)

civicrm/civicrm-version.php

 <?php
 /** @deprecated */
 function civicrmVersion( ) {
-  return array( 'version'  => '5.46.0',
+  return array( 'version'  => '5.46.1',
                 'cms'      => 'Wordpress',
                 'revision' => '' );
 }

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.23</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.0</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.39</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.32</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

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.46.0</version>
+  <version>5.46.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.30</ver>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>stable</develStage>
   <comments>
     FlexMailer is an email delivery engine which replaces the internal guts

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.46.0</version>
+  <version>5.46.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:hidden</tag>

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.46.0</version>
+  <version>5.46.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

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.46.0</version>
+  <version>5.46.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.38</ver>