From 630e746ef0cb1f8f31aa0496b394ddbe975fdab0 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Wed, 15 Jul 2020 07:14:55 -0400
Subject: [PATCH] civicrm release
---
civicrm.php | 6 +--
civicrm/CRM/Contact/BAO/Query.php | 4 ++
civicrm/CRM/Dedupe/Merger.php | 11 ++++
civicrm/CRM/Report/Form.php | 24 ++++-----
.../Upgrade/Incremental/sql/5.27.2.mysql.tpl | 1 +
civicrm/civicrm-version.php | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.27.2.md | 53 +++++++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 ++---
civicrm/vendor/composer/autoload_static.php | 12 ++---
civicrm/xml/version.xml | 2 +-
14 files changed, 108 insertions(+), 36 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.27.2.mysql.tpl
create mode 100644 civicrm/release-notes/5.27.2.md
diff --git a/civicrm.php b/civicrm.php
index 4a839c9fb1..5f6db9320c 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.27.1
+Version: 5.27.2
Requires at least: 4.9
Requires PHP: 7.1
Author: CiviCRM LLC
@@ -56,7 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
// Set version here: when it changes, will force JS to reload
-define( 'CIVICRM_PLUGIN_VERSION', '5.27.1' );
+define( 'CIVICRM_PLUGIN_VERSION', '5.27.2' );
// Store reference to this file
if (!defined('CIVICRM_PLUGIN_FILE')) {
@@ -367,7 +367,7 @@ class CiviCRM_For_WordPress {
* There is no session handling in WP - hence we start it for CiviCRM pages
* except when running via WP-CLI which does not require sessions.
*/
- if ( empty( $session_id ) && ! ( defined( 'WP_CLI' ) && WP_CLI ) && ( PHP_SAPI !== 'cli' ) ) {
+ if ( empty( $session_id ) && ! ( defined( 'WP_CLI' ) && WP_CLI ) ) {
session_start();
}
diff --git a/civicrm/CRM/Contact/BAO/Query.php b/civicrm/CRM/Contact/BAO/Query.php
index 694f6a84d4..65917cafe3 100644
--- a/civicrm/CRM/Contact/BAO/Query.php
+++ b/civicrm/CRM/Contact/BAO/Query.php
@@ -5053,6 +5053,10 @@ civicrm_relationship.start_date > {$today}
$this->_skipDeleteClause
);
+ if (!$onlyDeleted && CRM_Core_Permission::check('access deleted contacts')) {
+ $this->_permissionWhereClause = str_replace(' ( 1 ) ', '(contact_a.is_deleted = 0)', $this->_permissionWhereClause);
+ }
+
// regenerate fromClause since permission might have added tables
if ($this->_permissionWhereClause) {
//fix for row count in qill (in contribute/membership find)
diff --git a/civicrm/CRM/Dedupe/Merger.php b/civicrm/CRM/Dedupe/Merger.php
index 9f161af164..39f649765f 100644
--- a/civicrm/CRM/Dedupe/Merger.php
+++ b/civicrm/CRM/Dedupe/Merger.php
@@ -222,6 +222,11 @@ class CRM_Dedupe_Merger {
}
$contactReferences = $coreReferences = CRM_Core_DAO::getReferencesToContactTable();
+ foreach (['civicrm_group_contact_cache', 'civicrm_acl_cache', 'civicrm_acl_contact_cache'] as $tableName) {
+ // Don't merge cache tables. These should be otherwise cleared at some point in the dedupe
+ // but they are prone to locking to let's not touch during the dedupe.
+ unset($contactReferences[$tableName], $coreReferences[$tableName]);
+ }
CRM_Utils_Hook::merge('cidRefs', $contactReferences);
if ($contactReferences !== $coreReferences) {
@@ -527,6 +532,12 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
continue;
}
+ if ($table === 'civicrm_activity_contact') {
+ $sqls[] = "UPDATE IGNORE civicrm_activity_contact SET contact_id = $mainId WHERE contact_id = $otherId";
+ $sqls[] = "DELETE FROM civicrm_activity_contact WHERE contact_id = $otherId";
+ continue;
+ }
+
// use UPDATE IGNORE + DELETE query pair to skip on situations when
// there's a UNIQUE restriction on ($field, some_other_field) pair
if (isset($cidRefs[$table])) {
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index abbd87fd93..0768843c5e 100644
--- a/civicrm/CRM/Report/Form.php
+++ b/civicrm/CRM/Report/Form.php
@@ -139,11 +139,6 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
protected $_groupFilter = FALSE;
- /**
- * Required for civiexportexcel.
- */
- public $supportsExportExcel = TRUE;
-
/**
* Has the report been optimised for group filtering.
*
@@ -1440,7 +1435,7 @@ class CRM_Report_Form extends CRM_Core_Form {
if (!CRM_Core_Permission::check('view report sql')) {
return;
}
- $ignored_output_modes = ['pdf', 'csv', 'print', 'excel2007'];
+ $ignored_output_modes = ['pdf', 'csv', 'print'];
if (in_array($this->_outputMode, $ignored_output_modes)) {
return;
}
@@ -2190,6 +2185,10 @@ class CRM_Report_Form extends CRM_Core_Form {
$sqlOP = $this->getSQLOperator($relative);
return "( {$fieldName} {$sqlOP} )";
}
+ if (strlen($to) === 10) {
+ // If we just have the date we assume the end of that day.
+ $to .= ' 23:59:59';
+ }
if ($relative) {
list($from, $to) = $this->getFromTo($relative, $from, $to, $fromTime, $toTime);
@@ -2862,11 +2861,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->_absoluteUrl = TRUE;
$this->addPaging = FALSE;
}
- elseif ($this->_outputMode == 'excel2007') {
- $printOnly = TRUE;
- $this->_absoluteUrl = TRUE;
- $this->addPaging = FALSE;
- }
elseif ($this->_outputMode == 'copy' && $this->_criteriaForm) {
$this->_createNew = TRUE;
}
@@ -3316,7 +3310,10 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
if (!empty($this->_params["{$fieldName}_relative"])) {
list($from, $to) = CRM_Utils_Date::getFromTo($this->_params["{$fieldName}_relative"], NULL, NULL);
}
-
+ if (strlen($to) === 10) {
+ // If we just have the date we assume the end of that day.
+ $to .= ' 23:59:59';
+ }
if ($from || $to) {
if ($from) {
$from = date('l j F Y, g:iA', strtotime($from));
@@ -3501,9 +3498,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
elseif ($this->_outputMode == 'csv') {
CRM_Report_Utils_Report::export2csv($this, $rows);
}
- elseif ($this->_outputMode == 'excel2007') {
- CRM_CiviExportExcel_Utils_Report::export2excel2007($this, $rows);
- }
elseif ($this->_outputMode == 'group') {
$group = $this->_params['groups'];
$this->add2group($group);
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.27.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.27.2.mysql.tpl
new file mode 100644
index 0000000000..8b777e8cbf
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.27.2.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.27.2 during upgrade *}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index fb14149927..ea6b49cc83 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.27.1',
+ return array( 'version' => '5.27.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 875c9cf5ac..5c3503d850 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.27.2
+
+Released July 14, 2020
+
+- **[Synopsis](release-notes/5.27.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.27.2.md#bugs)**
+- **[Credits](release-notes/5.27.2.md#credits)**
+- **[Feedback](release-notes/5.27.2.md#feedback)**
+
## CiviCRM 5.27.1
Released July 9, 2020
diff --git a/civicrm/release-notes/5.27.2.md b/civicrm/release-notes/5.27.2.md
new file mode 100644
index 0000000000..c658eeabfb
--- /dev/null
+++ b/civicrm/release-notes/5.27.2.md
@@ -0,0 +1,53 @@
+# CiviCRM 5.27.2
+
+Released July 14, 2020
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities? | no |
+| 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
+
+* **_CiviMail_: Tracking links include extraneous parameters on WordPress/Joomla
+ ([dev/core#1865](https://lab.civicrm.org/dev/core/-/issues/1865):
+ [#17797](https://github.com/civicrm/civicrm-core/pull/17797))**
+* **_CiviReport_: Date-time filters incorrectly use time 12:00AM ([dev/core#1867](https://lab.civicrm.org/dev/core/-/issues/1867):
+ [#17811](https://github.com/civicrm/civicrm-core/pull/17811),
+ [#17820](https://github.com/civicrm/civicrm-core/pull/17820))**
+* **_Dedupe_: Fatal error when merging certain contacts
+ ([dev/core#1862](https://lab.civicrm.org/dev/core/-/issues/1862):
+ [#17803](https://github.com/civicrm/civicrm-core/pull/17803),
+ [#17814](https://github.com/civicrm/civicrm-core/pull/17814))**
+* **_Search_: Incorrectly displays deleted contacts
+ ([dev/core#1864](https://lab.civicrm.org/dev/core/-/issues/1864):
+ [#17798](https://github.com/civicrm/civicrm-core/pull/17798))**
+
+## <a name="credits"></a>Credits
+
+<!-- X: TIP: In buildkit, the CLI command civicredits.php can help autocomplete contributor names with the typical formatting. -->
+
+This release was developed by the following authors and reviewers:
+
+wortfm; Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin
+Cristiano; Stephen Palmstrom; John Kingsnorth; JMA Consulting - Seamus Lee;
+Dave D; CiviDesk - Yashodha Chaku; CiviCRM - Tim Otten, Coleman Watts;
+Christian Wach; Andrew Thompson
+
+## <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`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 0e9eb3ae54..21f644ad8e 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23897,4 +23897,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.27.1';
+UPDATE civicrm_domain SET version = '5.27.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 507cfb6896..eb0f7cbe54 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -399,7 +399,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.27.1',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.27.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index a2c75758f8..eaedebd528 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34::getLoader();
+return ComposerAutoloaderInit1eea4a59cf4f6465d1dd69a18796e920::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 018cc205a0..2684fd73f7 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 ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34
+class ComposerAutoloaderInit1eea4a59cf4f6465d1dd69a18796e920
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit1eea4a59cf4f6465d1dd69a18796e920', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit1eea4a59cf4f6465d1dd69a18796e920', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInitebda0ae7792361882a5e2c212aa3ea34
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireebda0ae7792361882a5e2c212aa3ea34($fileIdentifier, $file);
+ composerRequire1eea4a59cf4f6465d1dd69a18796e920($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequireebda0ae7792361882a5e2c212aa3ea34($fileIdentifier, $file)
+function composerRequire1eea4a59cf4f6465d1dd69a18796e920($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 7ea9aa7bee..2eeb7c2277 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34
+class ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -497,11 +497,11 @@ class ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitebda0ae7792361882a5e2c212aa3ea34::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit1eea4a59cf4f6465d1dd69a18796e920::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 70c04d2f53..eb0f1e5968 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.27.1</version_no>
+ <version_no>5.27.2</version_no>
</version>
--
GitLab