diff --git a/civicrm.php b/civicrm.php index f9bdb485f4f0213f1d1b3937d38bfe17083264a9..cbe71c945707dfc28ab57f991a270b7bc32c7909 100644 --- a/civicrm.php +++ b/civicrm.php @@ -2,7 +2,7 @@ /** * Plugin Name: CiviCRM * Description: CiviCRM - Growing and Sustaining Relationships - * Version: 5.63.0 + * Version: 5.63.1 * 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.63.0'); +define('CIVICRM_PLUGIN_VERSION', '5.63.1'); // Store reference to this file. if (!defined('CIVICRM_PLUGIN_FILE')) { diff --git a/civicrm/CRM/Admin/Form/PaymentProcessor.php b/civicrm/CRM/Admin/Form/PaymentProcessor.php index 9cf1fe639462a215c25f76c0c062aca9e6fb60a1..e08f10699303c452ea4b2b7fdf2a19942dcbbe3a 100644 --- a/civicrm/CRM/Admin/Form/PaymentProcessor.php +++ b/civicrm/CRM/Admin/Form/PaymentProcessor.php @@ -429,7 +429,6 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { $creditCards[$type] = $creditCardTypes[$type]; } } - $creditCards = json_encode($creditCards); } $params = array_merge([ diff --git a/civicrm/CRM/Core/Config.php b/civicrm/CRM/Core/Config.php index 2aa80a0cfe1473424b653cb59cc4dcfb916c35ec..29719a59c6cb0f76c6d74c1b4b75cd9f39c2d7ac 100644 --- a/civicrm/CRM/Core/Config.php +++ b/civicrm/CRM/Core/Config.php @@ -290,7 +290,7 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge { if ($this->userPermissionClass->isModulePermissionSupported()) { // Can store permissions -- so do it! $this->userPermissionClass->upgradePermissions( - CRM_Core_Permission::basicPermissions() + CRM_Core_Permission::basicPermissions(TRUE) ); } elseif (get_class($this->userPermissionClass) !== 'CRM_Core_Permission_UnitTests') { diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyThree.php b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyThree.php index d3587657ae841bffc4615dfb3d081aee657c7b3b..e7825cfc53ee72944d86af6b9bc39d95cc2e2206 100644 --- a/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyThree.php +++ b/civicrm/CRM/Upgrade/Incremental/php/FiveSixtyThree.php @@ -50,4 +50,35 @@ class CRM_Upgrade_Incremental_php_FiveSixtyThree extends CRM_Upgrade_Incremental $this->addTask('Make ContributionPage.frontend_title required', 'alterColumn', 'civicrm_contribution_page', 'frontend_title', "varchar(255) NOT NULL COMMENT 'Contribution Page Public title'", TRUE); } + /** + * Upgrade step; adds tasks including 'runSql'. + * + * @param string $rev + * The version number matching this function name + * + * @throws \Civi\Core\Exception\DBQueryException + */ + public function upgrade_5_63_1(string $rev): void { + $this->addTask('Fix double json encoding of accepted_credit_cards field in payment processor table', 'fixDoubleEscapingPaymentProcessorCreditCards'); + } + + /** + * Fix any double json encoding in Payment Processor accepted_credit_cards field + */ + public static function fixDoubleEscapingPaymentProcessorCreditCards() { + $paymentProcessors = CRM_Core_DAO::executeQuery("SELECT id, accepted_credit_cards FROM civicrm_payment_processor"); + while ($paymentProcessors->fetch()) { + if (!empty($paymentProcessors->accepted_credit_cards)) { + $accepted_credit_cards = json_decode($paymentProcessors->accepted_credit_cards, TRUE); + if (is_numeric(array_keys($accepted_credit_cards)[0])) { + CRM_Core_DAO::executeQuery("UPDATE civicrm_payment_processor SET accepted_credit_cards = %1 WHERE id = %2", [ + 1 => [$accepted_credit_cards[0], 'String'], + 2 => [$paymentProcessors->id, 'Positive'], + ]); + } + } + } + return TRUE; + } + } diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php index d89badf6fbfbf12244f5067be52e3a6374c5c303..ce24d1ae8359ced69c0204cbbefc9bcf1fb455a5 100644 --- a/civicrm/civicrm-version.php +++ b/civicrm/civicrm-version.php @@ -1,7 +1,7 @@ <?php /** @deprecated */ function civicrmVersion( ) { - return array( 'version' => '5.63.0', + return array( 'version' => '5.63.1', 'cms' => 'Wordpress', 'revision' => '' ); } diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml index 8c27287e5781056e42b6bfdd929341b18405b0bb..ec50f0cfb95534d2540ff2d4a41fa5b3a16859ff 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.63.0</version> + <version>5.63.1</version> <develStage>beta</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml index d205dff0811a68e6c662acfbab74d8ab102ae3c1..7ff71d56bf8d2e8ae9d87d81dc03c1fca60bc262 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.63.0</version> + <version>5.63.1</version> <develStage>beta</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml index b4e0c18c8985c72e962a3d67a738333a8c301b6b..c1e613667ffc132ed20436243f4ff07d123447cf 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.63.0</version> + <version>5.63.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml index 93a270483ec2010ffce9efef6dff5a04432ba445..5aff9b7eeb59c3417787dfe90fe437a9bdb36f90 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.63.0</version> + <version>5.63.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml index 5c38be24ef185fc1177bb0ef3bba9f4b19c7096c..ae1d8c8c2da0648999ac769be7cafdcd46863e15 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/civi_campaign/info.xml b/civicrm/ext/civi_campaign/info.xml index ed44df3fcc9c29c664e41a80ac0d8bdd97357bdb..bc4f3bbd387ed676af5eb7b94b5162543328de67 100644 --- a/civicrm/ext/civi_campaign/info.xml +++ b/civicrm/ext/civi_campaign/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_case/info.xml b/civicrm/ext/civi_case/info.xml index af69c4574973dcec5b775e44424c71cae0c1e59b..946b417bb70d941a8c6668f5e9ac5b73f740d5d8 100644 --- a/civicrm/ext/civi_case/info.xml +++ b/civicrm/ext/civi_case/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_contribute/info.xml b/civicrm/ext/civi_contribute/info.xml index 36f929eac0f7048533a63f42efc783275273e24f..c435ca1e00e4fb1eb729c255a9997bb409fd7798 100644 --- a/civicrm/ext/civi_contribute/info.xml +++ b/civicrm/ext/civi_contribute/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_event/info.xml b/civicrm/ext/civi_event/info.xml index 98bd6f55dc5d4cdc1e33795f2fba5845760bd4e4..8a02b44f9384fb246e9d2d70c127919cf9c5d18d 100644 --- a/civicrm/ext/civi_event/info.xml +++ b/civicrm/ext/civi_event/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_mail/info.xml b/civicrm/ext/civi_mail/info.xml index 96562fa632c5f618fc3404c492f574d1263e0acd..f5e0f2931f2fb7d4c0be8c7154813a7c3a0bee31 100644 --- a/civicrm/ext/civi_mail/info.xml +++ b/civicrm/ext/civi_mail/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_member/info.xml b/civicrm/ext/civi_member/info.xml index 8449d3b9ad3503d91bc12cc41a0006cb7ddacc0e..7e7e7cca3e9a9854b86795ab67c6a7c569563f8f 100644 --- a/civicrm/ext/civi_member/info.xml +++ b/civicrm/ext/civi_member/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_pledge/info.xml b/civicrm/ext/civi_pledge/info.xml index 55edb5b3d89555f0eaeb856aad683445e36d5055..adf85af640accd7eeff9786976ce2f89243bb064 100644 --- a/civicrm/ext/civi_pledge/info.xml +++ b/civicrm/ext/civi_pledge/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civi_report/info.xml b/civicrm/ext/civi_report/info.xml index a02b25cdaea65d408a8db5c46e2d33b431369e5a..cf9630df279c211b497a67a7bac24c65d4f3e02c 100644 --- a/civicrm/ext/civi_report/info.xml +++ b/civicrm/ext/civi_report/info.xml @@ -13,7 +13,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-04-08</releaseDate> - <version>5.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>component</tag> diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml index b7a096004d979e2be0b27f870affbcefa914886b..475e11fc55ccb2571fa2069daf0cd02295f9f1b7 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.63.0</version> + <version>5.63.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml index 769f6cdcd694590569afcc954f38295ac73f9401..d14d0ab5067d2af1be9e08dcf5b8373d4a6a4727 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/civiimport/info.xml b/civicrm/ext/civiimport/info.xml index 1110db1ab82733c0242b91aba47b4ec298ba6842..e5d4d552594d9f41db36c4e73ce37d9d7edef690 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.63.0</version> + <version>5.63.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml index 9941d5222cb1108536e7cf540da614f71d5c9612..45bde4739061a312d7c71a2780223feaafa44d06 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml index ee3d927937a8fe44a1dac535780abaa54e78af01..20065bd149e25ff5a544f50013a83fbc99f69c59 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/elavon/info.xml b/civicrm/ext/elavon/info.xml index 9e4af0ee5fb8072f759b6aec0f7460f481357282..cc77285bd1fba0e9530625d4381aa83d16868e79 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml index 964d9bf718b2a8250c4244d6037db4ce8806058d..ec1ada469089be403d99640047f8a195e01ec36d 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.63.0</version> + <version>5.63.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml index 71aed8d988835624ab8727373bece4e0691bd1e8..a0e4d7de48ea1385720a8add4f97a18288bc0599 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.63.0</version> + <version>5.63.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml index 6b670251cf931b201b1d25f5e0e3aed9e3ec8952..6604c189161bf3c4756e7b17370aa87af5b6b53d 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml index 55ec7f77f9d7fa569b7e9f050a3569638340e36b..e2c83abe5cc2980ed4d9fc4680de4e1f0f5571e0 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.63.0</version> + <version>5.63.1</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 7eaa0cff01634a444ae34050ee160a46c1c747b0..e054fadef05a83a1847081efb63c4bbab8cd6874 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.63.0</version> + <version>5.63.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml index 33625ed9fdd9623d7053ec1a953164a0735321e1..ddfc1d8028d38169e01b12359a853e586a8a80f8 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.63.0</version> + <version>5.63.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 05431d3b07afb763d039f3ce56327f55b11c5b98..1af05b9140e65625fcdc1c5f41e5870fba678d1b 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.63.0</version> + <version>5.63.1</version> <develStage>alpha</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml index b1809cf8b724b851a36c44cb08bb31cb12e624dd..b36d0832dc68e87bfaeb11e655f166447db3ab6c 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml index 598c19c7e2ca26fa61d957c511786c197ed4cfc6..38bd2edd506a1e456af5fa1c6fa66d4341b887a7 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <compatibility> <ver>5.63</ver> diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml index fb55f29df6867fc710619234949813197277f75f..e25398f9a3d91643d4ce0235f376dc624b741819 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.63.0</version> + <version>5.63.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml index bbd0fd112aad6370e9a2584c4a567248dff68314..2a0d6c1abd57ad2acebc9c819e02b635f0202fd8 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.63.0</version> + <version>5.63.1</version> <develStage>stable</develStage> <tags> <tag>mgmt:required</tag> diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml index 83ce9182d4a99685c743037d6b5fbf4160737ed8..c955fe06bc024f34011ac836ad7bdcf7bb083eae 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.63.0</version> + <version>5.63.1</version> <tags> <tag>mgmt:hidden</tag> </tags> diff --git a/civicrm/extern/url.php b/civicrm/extern/url.php index 370a1fe5d276b02422122fdef2aa27eb5a8b8e04..1c1fac3b32f69844439ceaf7fad4dc1d9a93e4ff 100644 --- a/civicrm/extern/url.php +++ b/civicrm/extern/url.php @@ -54,6 +54,6 @@ if (strlen($query_string) > 0) { $url = str_replace('&', '&', $url); // CRM-17953 - The CMS is not bootstrapped so cannot use CRM_Utils_System::redirect -header('X-Robots-Tag', 'noindex'); +header('X-Robots-Tag: noindex'); header('Location: ' . $url); CRM_Utils_System::civiExit(); diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md index 6a71f8909adabc6cc18aa4b6c7a39a9ae443cff5..e3be85922839fb823436bc209882e636c091d0e9 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.63.1 + +Released July 7, 2023 + +- **[Synopsis](release-notes/5.63.1.md#synopsis)** +- **[Bugs resolved](release-notes/5.63.1.md#bugs)** +- **[Credits](release-notes/5.63.1.md#credits)** +- **[Feedback](release-notes/5.63.1.md#feedback)** + ## CiviCRM 5.63.0 Released July 5, 2023 diff --git a/civicrm/release-notes/5.63.1.md b/civicrm/release-notes/5.63.1.md new file mode 100644 index 0000000000000000000000000000000000000000..003e7181b4996f2bfaedb954d90d31cdf2c3e911 --- /dev/null +++ b/civicrm/release-notes/5.63.1.md @@ -0,0 +1,42 @@ +# CiviCRM 5.63.1 + +Released July 7, 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 + +* **_CiviContribute_: "Accepted credit cards" saved incorrectly when configuring a payment processor ([dev/core#4418](https://lab.civicrm.org/dev/core/-/issues/4418): [#26760](https://github.com/civicrm/civicrm-core/pull/26760), [#26755](https://github.com/civicrm/civicrm-core/pull/26755))** +* **_CiviMail_: Click-through via "extern/url.php" leads to HTTP 500 ([dev/core#4416](https://lab.civicrm.org/dev/core/-/issues/4416): [#26747](https://github.com/civicrm/civicrm-core/pull/26747))** +* **_CiviMember_: Configuration form generates error on PHP 8 ([dev/core#4419](https://lab.civicrm.org/dev/core/-/issues/4419): [#26757](https://github.com/civicrm/civicrm-core/pull/26757))** +* **_Components_: Preserve component-related permissions (when disabled/enabled) ([dev/core#4413](https://lab.civicrm.org/dev/core/-/issues/4413): [#26744](https://github.com/civicrm/civicrm-core/pull/26744))** +* **_Custom Data_: Fields with "options per line" (for checkbox/radio fields) generate errors on PHP 8 ([#26763](https://github.com/civicrm/civicrm-core/pull/26763))** + +## <a name="credits"></a>Credits + +This release was developed by the following authors and reviewers: + +Wildsight - Lars Sander-Green; Wikimedia Foundation - Eileen McNaughton; Megaphone +Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; Dave D; CiviCRM - Tim +Otten, Coleman Watts; Agileware - Justin Freeman + +## <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 5400381661c835ec517e3dc0852e721155ea76ee..437b6934e9eb89a18d8089985bc87c38f1a4a3bb 100644 --- a/civicrm/sql/civicrm_data.mysql +++ b/civicrm/sql/civicrm_data.mysql @@ -24025,4 +24025,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.63.0'; +UPDATE civicrm_domain SET version = '5.63.1'; diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql index 5742e192757cc2db498e6568a8a98ab62acb2674..4475f05a63ae30cb95186c67c19d7c52c240b9bc 100644 --- a/civicrm/sql/civicrm_generated.mysql +++ b/civicrm/sql/civicrm_generated.mysql @@ -3042,7 +3042,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.63.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.63.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/Contact/Form/Task/Batch.tpl b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl index 2cd61d93b1a1f1df9ccae907fac67afd2491ac50..418dd56c80e180b8d5aad3f73b6ef1db6cf6ac02 100644 --- a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl +++ b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl @@ -38,11 +38,9 @@ <table class="form-layout-compressed"> <tr> {* sort by fails for option per line. Added a variable to iterate through the element array*} - {assign var="index" value="1"} {foreach name=optionOuter key=optionKey item=optionItem from=$form.field.$cid.$n} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} + {* There are both numeric and non-numeric keys mixed in here, where the non-numeric are metadata that aren't arrays with html members. *} + {if is_array($optionItem) && array_key_exists('html', $optionItem)} <td class="labels font-light">{$form.field.$cid.$n.$optionKey.html}</td> {if $count == $field.options_per_line} </tr> diff --git a/civicrm/templates/CRM/Custom/Form/Preview.tpl b/civicrm/templates/CRM/Custom/Form/Preview.tpl index f4481271e845b83ae3380a9652ec3788d620160a..592b916ea9c9ec4bc39704655de1f459c8dc426b 100644 --- a/civicrm/templates/CRM/Custom/Form/Preview.tpl +++ b/civicrm/templates/CRM/Custom/Form/Preview.tpl @@ -43,11 +43,9 @@ <table class="form-layout-compressed"> <tr> {* sort by fails for option per line. Added a variable to iterate through the element array*} - {assign var="index" value="1"} {foreach name=outer key=key item=item from=$form.$element_name} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} + {* There are both numeric and non-numeric keys mixed in here, where the non-numeric are metadata that aren't arrays with html members. *} + {if is_array($item) && array_key_exists('html', $item)} <td class="labels font-light">{$form.$element_name.$key.html}</td> {if $count == $element.options_per_line} {assign var="count" value="1"} diff --git a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl index 27760a6b08f1008318c7bb0ad62d5b7d9cd96fe6..a77ecf5f957d5452230b8e95806f4bf8ebcfdc73 100644 --- a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl +++ b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl @@ -65,11 +65,9 @@ <table class="form-layout-compressed"> <tr> {* sort by fails for option per line. Added a variable to iterate through the element array*} - {assign var="index" value="1"} {foreach name=optionOuter key=optionKey item=optionItem from=$form.field.$pid.$n} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} + {* There are both numeric and non-numeric keys mixed in here, where the non-numeric are metadata that aren't arrays with html members. *} + {if is_array($optionItem) && array_key_exists('html', $optionItem)} <td class="labels font-light">{$form.field.$pid.$n.$optionKey.html}</td> {if $count == $field.options_per_line} </tr> diff --git a/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl b/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl index 0974ef3d2375d243790191122d294811a1135b6a..3c4af099d2ddb573b1afce6f80187027a4c3fb58 100644 --- a/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl +++ b/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl @@ -61,11 +61,9 @@ <table class="report"> <tr class="columnheader" style="vertical-align:top;"><th style="border-right: 1px solid #4E82CF;">{ts}Include these membership types{/ts}</th><th{if $is_recur} style="border-right: 1px solid #4E82CF;"{/if}>{ts}Default{/ts}<br /> </th>{if $is_recur}<th>{ts}Auto-renew{/ts}</th>{/if}</tr> - {assign var="index" value="1"} {foreach name=outer key=key item=item from=$form.membership_type} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} + {* There are both numeric and non-numeric keys mixed in here, where the non-numeric are metadata that aren't arrays with html members. *} + {if is_array($item) && array_key_exists('html', $item)} <tr> <td class="labels font-light">{$form.membership_type.$key.html}</td> <td class="labels font-light">{$form.membership_type_default.$key.html}</td> diff --git a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl index eb2ef70c6aa368cc89c336ae7673329c6b2da548..3fd103679594bf4e85ab9f44761db1036fa94739 100644 --- a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl +++ b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl @@ -103,11 +103,9 @@ <table class="form-layout-compressed"> <tr> {* sort by fails for option per line. Added a variable to iterate through the element array*} - {assign var="index" value="1"} {foreach name=outer key=key item=item from=$form.$n} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} + {* There are both numeric and non-numeric keys mixed in here, where the non-numeric are metadata that aren't arrays with html members. *} + {if is_array($item) && array_key_exists('html', $item)} <td class="labels font-light">{$form.$n.$key.html}</td> {if $count == $field.options_per_line} </tr> diff --git a/civicrm/templates/CRM/UF/Form/Fields.tpl b/civicrm/templates/CRM/UF/Form/Fields.tpl index b261f2dcbde6fbf4a8dfc68c75ca1471e4e51f1f..2dc383fda3e89b3ac730f50a22e4bebfb7fac112 100644 --- a/civicrm/templates/CRM/UF/Form/Fields.tpl +++ b/civicrm/templates/CRM/UF/Form/Fields.tpl @@ -57,11 +57,9 @@ <table class="form-layout-compressed"> <tr> {* sort by fails for option per line. Added a variable to iterate through the element array*} - {assign var="index" value="1"} {foreach name=outer key=key item=item from=$formElement} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} + {* There are both numeric and non-numeric keys mixed in here, where the non-numeric are metadata that aren't arrays with html members. *} + {if is_array($item) && array_key_exists('html', $item)} <td class="labels font-light">{$formElement.$key.html}</td> {if $count == $field.options_per_line} </tr> diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php index 262de456075be146e2ef64cd31f9e60d2cd9edf7..fb9016d069bd9a82a528e14405d1e529e96f1943 100644 --- a/civicrm/vendor/autoload.php +++ b/civicrm/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d::getLoader(); +return ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14::getLoader(); diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php index 4e296470e9d3f73780a4f60be15d3bb2f11c0399..3c3b61ed58fad7ca3562c7a4472cc379e325522e 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 ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d +class ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14 { private static $loader; @@ -24,9 +24,9 @@ class ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitfd642c2119abd8f57d9c6c5ebd3c4b14', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; $includePaths[] = get_include_path(); @@ -36,7 +36,7 @@ class ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -57,12 +57,12 @@ class ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiree6b1ce1a2cab093218eb2f74131ef39d($fileIdentifier, $file); + composerRequirefd642c2119abd8f57d9c6c5ebd3c4b14($fileIdentifier, $file); } return $loader; @@ -74,7 +74,7 @@ class ComposerAutoloaderInite6b1ce1a2cab093218eb2f74131ef39d * @param string $file * @return void */ -function composerRequiree6b1ce1a2cab093218eb2f74131ef39d($fileIdentifier, $file) +function composerRequirefd642c2119abd8f57d9c6c5ebd3c4b14($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 676eff21af16ef1577329854b5d367c0bd683f7f..304d45f41d52f73925b1cde66a84588027a4c282 100644 --- a/civicrm/vendor/composer/autoload_static.php +++ b/civicrm/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d +class ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -729,11 +729,11 @@ class ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::$prefixesPsr0; - $loader->fallbackDirsPsr0 = ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInite6b1ce1a2cab093218eb2f74131ef39d::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$prefixesPsr0; + $loader->fallbackDirsPsr0 = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInitfd642c2119abd8f57d9c6c5ebd3c4b14::$classMap; }, null, ClassLoader::class); } diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php index b62838ddfc1578cb1c205b205968866ed87ad5c7..a7239e86edf116736b08dae667ffadaf5c3b55e9 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' => '7e82548a658390a534fff211c51bd2d7e815eef6', + 'reference' => '27dd9bcab5d0ece3f73e0c6d2a1c7d3966d03c58', 'name' => 'civicrm/civicrm-core', 'dev' => true, ), @@ -43,7 +43,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '7e82548a658390a534fff211c51bd2d7e815eef6', + 'reference' => '27dd9bcab5d0ece3f73e0c6d2a1c7d3966d03c58', 'dev_requirement' => false, ), 'civicrm/civicrm-cxn-rpc' => array( diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml index f13e5aba121f4e588180d8d7762e4061ae828f09..5ca8b6b27d6297f5406301a4c56361b2369b6e90 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.63.0</version_no> + <version_no>5.63.1</version_no> </version>