From d855059df99c4998dcc4b4c20eda2296f480d592 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Wed, 11 Mar 2020 07:36:00 -0400
Subject: [PATCH] civicrm release
---
civicrm.php | 4 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 2 +-
civicrm/CRM/Core/I18n.php | 2 +-
.../Upgrade/Incremental/sql/5.23.1.mysql.tpl | 1 +
civicrm/CRM/Utils/Check/Component/Schema.php | 2 +-
civicrm/CRM/Utils/System/WordPress.php | 10 ++---
civicrm/Civi/Core/Paths.php | 43 ++++++++++++-------
civicrm/civicrm-version.php | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.23.1.md | 42 ++++++++++++++++++
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 +-
16 files changed, 107 insertions(+), 44 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.23.1.mysql.tpl
create mode 100644 civicrm/release-notes/5.23.1.md
diff --git a/civicrm.php b/civicrm.php
index 08738a0b40..10dcdffd32 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.23.0
+Version: 5.23.1
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://docs.civicrm.org/sysadmin/en/latest/install/wordpress/
@@ -54,7 +54,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
// Set version here: when it changes, will force JS to reload
-define( 'CIVICRM_PLUGIN_VERSION', '5.23.0' );
+define( 'CIVICRM_PLUGIN_VERSION', '5.23.1' );
// Store reference to this file
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index eef8a91dfd..4c5f133006 100644
--- a/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -38,7 +38,7 @@ class CRM_ACL_Form_WordPress_Permissions extends CRM_Core_Form {
}
foreach ($wp_roles->role_names as $role => $name) {
// Don't show the permissions options for administrator, as they have all permissions
- if ( is_multisite() OR $role !== 'administrator') {
+ if ($role !== 'administrator') {
$roleObj = $wp_roles->get_role($role);
if (!empty($roleObj->capabilities)) {
foreach ($roleObj->capabilities as $ckey => $cname) {
diff --git a/civicrm/CRM/Core/I18n.php b/civicrm/CRM/Core/I18n.php
index 1da5d28005..aff19c9f80 100644
--- a/civicrm/CRM/Core/I18n.php
+++ b/civicrm/CRM/Core/I18n.php
@@ -282,7 +282,7 @@ class CRM_Core_I18n {
* @return string
*/
public static function getResourceDir() {
- return \Civi::paths()->getPath('[civicrm.l10n]/.');
+ return CRM_Utils_File::addTrailingSlash(\Civi::paths()->getPath('[civicrm.l10n]/.'));
}
/**
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.23.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.23.1.mysql.tpl
new file mode 100644
index 0000000000..4a946cf88e
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.23.1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.23.1 during upgrade *}
diff --git a/civicrm/CRM/Utils/Check/Component/Schema.php b/civicrm/CRM/Utils/Check/Component/Schema.php
index 5de044b1b7..c4b3a387ae 100644
--- a/civicrm/CRM/Utils/Check/Component/Schema.php
+++ b/civicrm/CRM/Utils/Check/Component/Schema.php
@@ -106,7 +106,7 @@ class CRM_Utils_Check_Component_Schema extends CRM_Utils_Check_Component {
continue;
}
foreach ($group['form_values'] as $formValues) {
- if (substr($formValues[0], 0, 7) == 'custom_') {
+ if (isset($formValues[0]) && (substr($formValues[0], 0, 7) == 'custom_')) {
list(, $customFieldID) = explode('custom_', $formValues[0]);
if (!in_array($customFieldID, $customFieldIds)) {
$problematicSG[CRM_Contact_BAO_SavedSearch::getName($group['id'], 'id')] = [
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index 094feb0419..d1cbaec087 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -838,13 +838,11 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
$contactCreated = 0;
$contactMatching = 0;
- // previously used $wpdb - which means WordPress *must* be bootstrapped
- $wpUsers = get_users(array(
- 'blog_id' => get_current_blog_id(),
- 'number' => -1,
- ));
+ global $wpdb;
+ $wpUserIds = $wpdb->get_col("SELECT $wpdb->users.ID FROM $wpdb->users");
- foreach ($wpUsers as $wpUserData) {
+ foreach ($wpUserIds as $wpUserId) {
+ $wpUserData = get_userdata($wpUserId);
$contactCount++;
if ($match = CRM_Core_BAO_UFMatch::synchronizeUFMatch($wpUserData,
$wpUserData->$id,
diff --git a/civicrm/Civi/Core/Paths.php b/civicrm/Civi/Core/Paths.php
index e2e1ff62ea..9099c3cff9 100644
--- a/civicrm/Civi/Core/Paths.php
+++ b/civicrm/Civi/Core/Paths.php
@@ -210,18 +210,23 @@ class Paths {
* @return mixed|string
*/
public function getPath($value) {
+ if ($value === NULL || $value === FALSE || $value === '') {
+ return FALSE;
+ }
+
$defaultContainer = self::DEFAULT_PATH;
if ($value && $value{0} == '[' && preg_match(';^\[([a-zA-Z0-9\._]+)\]/(.*);', $value, $matches)) {
$defaultContainer = $matches[1];
$value = $matches[2];
}
- if (empty($value)) {
- return FALSE;
- }
- if ($value === '.') {
+
+ $isDot = $value === '.';
+ if ($isDot) {
$value = '';
}
- return \CRM_Utils_File::absoluteDirectory($value, $this->getVariable($defaultContainer, 'path'));
+
+ $result = \CRM_Utils_File::absoluteDirectory($value, $this->getVariable($defaultContainer, 'path'));
+ return $isDot ? rtrim($result, '/' . DIRECTORY_SEPARATOR) : $result;
}
/**
@@ -229,6 +234,14 @@ class Paths {
*
* @param string $value
* The file path. The path may begin with a variable, e.g. "[civicrm.files]/upload".
+ *
+ * This function was designed for locating files under a given tree, and the
+ * the result for a straight variable expressions ("[foo.bar]") was not
+ * originally defined. You may wish to use one of these:
+ *
+ * - getVariable('foo.bar', 'url') => Lookup variable by itself
+ * - getUrl('[foo.bar]/') => Get the variable (normalized with a trailing "/").
+ * - getUrl('[foo.bar]/.') => Get the variable (normalized without a trailing "/").
* @param string $preferFormat
* The preferred format ('absolute', 'relative').
* The result data may not meet the preference -- if the setting
@@ -236,26 +249,26 @@ class Paths {
* absolute (regardless of preference).
* @param bool|NULL $ssl
* NULL to autodetect. TRUE to force to SSL.
- * @return mixed|string
+ * @return FALSE|string
+ * The URL for $value (string), or FALSE if the $value is not specified.
*/
public function getUrl($value, $preferFormat = 'relative', $ssl = NULL) {
+ if ($value === NULL || $value === FALSE || $value === '') {
+ return FALSE;
+ }
+
$defaultContainer = self::DEFAULT_URL;
if ($value && $value{0} == '[' && preg_match(';^\[([a-zA-Z0-9\._]+)\](/(.*))$;', $value, $matches)) {
$defaultContainer = $matches[1];
- $value = empty($matches[3]) ? '.' : $matches[3];
+ $value = $matches[3];
}
- if (empty($value)) {
- return FALSE;
- }
- if ($value === '.') {
- $value = '';
- }
- if (substr($value, 0, 4) == 'http') {
+ $isDot = $value === '.';
+ if (substr($value, 0, 5) === 'http:' || substr($value, 0, 6) === 'https:') {
return $value;
}
- $value = $this->getVariable($defaultContainer, 'url') . $value;
+ $value = rtrim($this->getVariable($defaultContainer, 'url'), '/') . ($isDot ? '' : "/$value");
if ($preferFormat === 'relative') {
$parsed = parse_url($value);
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index bad3effb54..f9ecaa2ca6 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.23.0',
+ return array( 'version' => '5.23.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index a77e40506a..ccffe9fba7 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.23.1
+
+Released March 10, 2020
+
+- **[Synopsis](release-notes/5.23.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.23.1.md#bugs)**
+- **[Credits](release-notes/5.23.1.md#credits)**
+- **[Feedback](release-notes/5.23.1.md#feedback)**
+
## CiviCRM 5.23.0
Released March 4, 2020
diff --git a/civicrm/release-notes/5.23.1.md b/civicrm/release-notes/5.23.1.md
new file mode 100644
index 0000000000..e121d919c7
--- /dev/null
+++ b/civicrm/release-notes/5.23.1.md
@@ -0,0 +1,42 @@
+# CiviCRM 5.23.1
+
+Released March 10, 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?** | **yes** |
+| 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
+
+* **_WordPress_: Fix hyperlinks between Civi and WP backends ([dev/core#1637](https://lab.civicrm.org/dev/core/issues/1637): [#16713](https://github.com/civicrm/civicrm-core/pull/16713), [#16735](https://github.com/civicrm/civicrm-core/pull/16735))**
+
+ __Aside__: The fix entails a subtle change to normalize the behavior of an internal API (`Civi::paths()->getUrl()`) when handling a previously undocumented special case (`[variable]/.` expressions).
+
+* **_Smart Groups_: Fix new warning about certain smart groups ([dev/core#1636](https://lab.civicrm.org/dev/core/issues/1636): [#16707](https://github.com/civicrm/civicrm-core/pull/16707))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin
+Cristiano; JMA Consulting - Seamus Lee; Dave D; CiviCRM - Coleman Watts, Tim
+Otten; Christian Wach
+
+## <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 05dbe5192b..c8d65a495a 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23945,4 +23945,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.23.0';
+UPDATE civicrm_domain SET version = '5.23.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index bf066eb35f..0098ff501d 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.23.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.23.1',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 708749ae27..15bd9b845b 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8::getLoader();
+return ComposerAutoloaderInit4a0373f0a815a7626cf79c6133cc5420::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 5d9c2db3d9..57d8217b5f 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 ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8
+class ComposerAutoloaderInit4a0373f0a815a7626cf79c6133cc5420
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit4a0373f0a815a7626cf79c6133cc5420', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit4a0373f0a815a7626cf79c6133cc5420', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInite6f45a43176252aa6a8458e979f01dd8
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequiree6f45a43176252aa6a8458e979f01dd8($fileIdentifier, $file);
+ composerRequire4a0373f0a815a7626cf79c6133cc5420($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequiree6f45a43176252aa6a8458e979f01dd8($fileIdentifier, $file)
+function composerRequire4a0373f0a815a7626cf79c6133cc5420($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 f98e998adc..2cb5737eba 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInite6f45a43176252aa6a8458e979f01dd8
+class ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -476,11 +476,11 @@ class ComposerStaticInite6f45a43176252aa6a8458e979f01dd8
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInite6f45a43176252aa6a8458e979f01dd8::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit4a0373f0a815a7626cf79c6133cc5420::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 500e0126f4..2227e70da9 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.23.0</version_no>
+ <version_no>5.23.1</version_no>
</version>
--
GitLab