Skip to content
Snippets Groups Projects
Verified Commit bc3f0df5 authored by Kevin Cristiano's avatar Kevin Cristiano :earth_americas:
Browse files

civicrm release

parent 29a10887
No related branches found
No related tags found
No related merge requests found
Showing
with 78 additions and 24 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
Plugin Name: CiviCRM Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships Description: CiviCRM - Growing and Sustaining Relationships
Version: 5.32.0 Version: 5.32.1
Requires at least: 4.9 Requires at least: 4.9
Requires PHP: 7.1 Requires PHP: 7.1
Author: CiviCRM LLC Author: CiviCRM LLC
...@@ -56,7 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; ...@@ -56,7 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
// Set version here: when it changes, will force JS to reload // Set version here: when it changes, will force JS to reload
define( 'CIVICRM_PLUGIN_VERSION', '5.32.0' ); define( 'CIVICRM_PLUGIN_VERSION', '5.32.1' );
// Store reference to this file // Store reference to this file
if (!defined('CIVICRM_PLUGIN_FILE')) { if (!defined('CIVICRM_PLUGIN_FILE')) {
......
...@@ -210,7 +210,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { ...@@ -210,7 +210,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
CRM_Contribute_BAO_ContributionRecur::updateOnNewPayment( CRM_Contribute_BAO_ContributionRecur::updateOnNewPayment(
(!empty($params['contribution_recur_id']) ? $params['contribution_recur_id'] : $params['prevContribution']->contribution_recur_id), (!empty($params['contribution_recur_id']) ? $params['contribution_recur_id'] : $params['prevContribution']->contribution_recur_id),
$contributionStatus, $contributionStatus,
$params['receive_date'] ?? NULL $params['receive_date'] ?? 'now'
); );
} }
......
...@@ -840,7 +840,7 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id ) ...@@ -840,7 +840,7 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id )
* *
* @throws \CiviCRM_API3_Exception * @throws \CiviCRM_API3_Exception
*/ */
public static function updateOnNewPayment($recurringContributionID, $paymentStatus, $effectiveDate) { public static function updateOnNewPayment($recurringContributionID, $paymentStatus, string $effectiveDate = 'now') {
if (!in_array($paymentStatus, ['Completed', 'Failed'])) { if (!in_array($paymentStatus, ['Completed', 'Failed'])) {
return; return;
......
...@@ -161,7 +161,7 @@ class CRM_Custom_Form_Field extends CRM_Core_Form { ...@@ -161,7 +161,7 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
$defaults['html_type'] = 'Text'; $defaults['html_type'] = 'Text';
$defaults['is_active'] = 1; $defaults['is_active'] = 1;
$defaults['option_type'] = 1; $defaults['option_type'] = 1;
$defaults['is_search_range'] = 1; $defaults['is_search_range'] = 0;
$defaults['weight'] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_CustomField', ['custom_group_id' => $this->_gid]); $defaults['weight'] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_CustomField', ['custom_group_id' => $this->_gid]);
$defaults['text_length'] = 255; $defaults['text_length'] = 255;
$defaults['note_columns'] = 60; $defaults['note_columns'] = 60;
......
...@@ -797,7 +797,7 @@ class CRM_Export_BAO_ExportProcessor { ...@@ -797,7 +797,7 @@ class CRM_Export_BAO_ExportProcessor {
list($select, $from, $where, $having) = $query->query(); list($select, $from, $where, $having) = $query->query();
$this->setQueryFields($query->_fields); $this->setQueryFields($query->_fields);
$whereClauses = ['trash_clause' => "contact_a.is_deleted != 1"]; $whereClauses = ['trash_clause' => "contact_a.is_deleted != 1"];
if ($this->getRequestedFields() && ($this->getComponentTable())) { if ($this->getRequestedFields() && $this->getComponentTable() && $this->getComponentTable() !== 'civicrm_contact') {
$from .= " INNER JOIN " . $this->getComponentTable() . " ctTable ON ctTable.contact_id = contact_a.id "; $from .= " INNER JOIN " . $this->getComponentTable() . " ctTable ON ctTable.contact_id = contact_a.id ";
} }
elseif ($this->getComponentClause()) { elseif ($this->getComponentClause()) {
......
{* file to handle db changes in 5.32.1 during upgrade *}
{* dev/core#2188, dev/core#337 (redux) - Ranges aren't support on these widgets. Note: This same change will run again 5.33.beta, and that's OK. *}
UPDATE civicrm_custom_field SET is_search_range = 0 WHERE html_type IN ('Radio', 'Select') AND data_type IN ('Money', 'Float', 'Int');
<?php <?php
/** @deprecated */ /** @deprecated */
function civicrmVersion( ) { function civicrmVersion( ) {
return array( 'version' => '5.32.0', return array( 'version' => '5.32.1',
'cms' => 'Wordpress', 'cms' => 'Wordpress',
'revision' => '' ); 'revision' => '' );
} }
......
...@@ -15,6 +15,15 @@ Other resources for identifying changes are: ...@@ -15,6 +15,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla * https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress * https://github.com/civicrm/civicrm-wordpress
## CiviCRM 5.32.1
Released December 5, 2020
- **[Synopsis](release-notes/5.32.1.md#synopsis)**
- **[Bugs resolved](release-notes/5.32.1.md#bugs)**
- **[Credits](release-notes/5.32.1.md#credits)**
- **[Feedback](release-notes/5.32.1.md#feedback)**
## CiviCRM 5.32.0 ## CiviCRM 5.32.0
Released December 2, 2020 Released December 2, 2020
......
# CiviCRM 5.32.1
Released December 5, 2020
- **[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?** | **yes** |
| Introduce features? | no |
| **Fix bugs?** | **yes** |
## <a name="bugs"></a>Bugs resolved
* **_CiviContribute_: Recurring contribution scheduled incorrectly ([dev/core#2231](https://lab.civicrm.org/dev/core/-/issues/2231): [#19119](https://github.com/civicrm/civicrm-core/pull/19119))**
This is a runtime fix that prevents further miscalculation. Sites which used a buggy version may also need to fix miscalculated schedules. Please visit [dev/core#2231](https://lab.civicrm.org/dev/core/-/issues/2231) for discussion of techniques or future updates.
* **_Advanced Search_: Error handling custom-fields of type "Integer" / "Radio" ([dev/core#2188](https://lab.civicrm.org/dev/core/-/issues/2188): [#18970](https://github.com/civicrm/civicrm-core/pull/18970), [#19123](https://github.com/civicrm/civicrm-core/pull/19123))**
* **_Export_: Error exporting non-primary fields ([dev/core#2230](https://lab.civicrm.org/dev/core/-/issues/2230): [#19104](https://github.com/civicrm/civicrm-core/pull/19104))**
## <a name="credits"></a>Credits
This release was developed by the following authors and reviewers:
Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Semper IT - Karin Gerritsen; Megaphone Technology Consulting - Jon Goldberg; MJW Consulting -
Matthew Wire; JMA Consulting - Seamus Lee; CiviCRM - Tim Otten, Coleman Watts; Agileware - Justin Freeman
## <a name="feedback"></a>Feedback
These release notes are edited by Tim Otten and Andrew Hunt. If you'd like to
provide feedback on them, please login to https://chat.civicrm.org/civicrm and
contact `@agh1`.
...@@ -23927,4 +23927,4 @@ INSERT INTO `civicrm_report_instance` ...@@ -23927,4 +23927,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`) ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
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;}'); ( @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.32.0'; UPDATE civicrm_domain SET version = '5.32.1';
...@@ -399,7 +399,7 @@ UNLOCK TABLES; ...@@ -399,7 +399,7 @@ UNLOCK TABLES;
   
LOCK TABLES `civicrm_domain` WRITE; LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; /*!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.32.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.32.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
   
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee::getLoader(); return ComposerAutoloaderInit5d94345bc4ed259a7a79dbedea6a29ee::getLoader();
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee class ComposerAutoloaderInit5d94345bc4ed259a7a79dbedea6a29ee
{ {
private static $loader; private static $loader;
...@@ -19,9 +19,9 @@ class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee ...@@ -19,9 +19,9 @@ class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit5d94345bc4ed259a7a79dbedea6a29ee', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit5d94345bc4ed259a7a79dbedea6a29ee', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php'; $includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path(); $includePaths[] = get_include_path();
...@@ -31,7 +31,7 @@ class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee ...@@ -31,7 +31,7 @@ class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::getInitializer($loader));
} else { } else {
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
...@@ -52,19 +52,19 @@ class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee ...@@ -52,19 +52,19 @@ class ComposerAutoloaderInit02baa4cb502baf70e8a73e2570df23ee
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::$files; $includeFiles = Composer\Autoload\ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire02baa4cb502baf70e8a73e2570df23ee($fileIdentifier, $file); composerRequire5d94345bc4ed259a7a79dbedea6a29ee($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequire02baa4cb502baf70e8a73e2570df23ee($fileIdentifier, $file) function composerRequire5d94345bc4ed259a7a79dbedea6a29ee($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee class ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee
{ {
public static $files = array ( public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
...@@ -583,11 +583,11 @@ class ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee ...@@ -583,11 +583,11 @@ class ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::$prefixesPsr0; $loader->prefixesPsr0 = ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::$prefixesPsr0;
$loader->fallbackDirsPsr0 = ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::$fallbackDirsPsr0; $loader->fallbackDirsPsr0 = ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::$fallbackDirsPsr0;
$loader->classMap = ComposerStaticInit02baa4cb502baf70e8a73e2570df23ee::$classMap; $loader->classMap = ComposerStaticInit5d94345bc4ed259a7a79dbedea6a29ee::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }
......
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<version> <version>
<version_no>5.32.0</version_no> <version_no>5.32.1</version_no>
</version> </version>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment