From a53d0ecff3c5845551e6ec0c6c8ece362ad62d0d Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Mon, 16 Mar 2020 07:50:43 -0400
Subject: [PATCH] civicrm release
---
civicrm.php | 4 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 2 +-
.../Upgrade/Incremental/sql/5.23.3.mysql.tpl | 1 +
civicrm/CRM/Utils/System/WordPress.php | 10 ++---
civicrm/civicrm-version.php | 2 +-
civicrm/js/jquery/jquery.crmEditable.js | 2 +-
civicrm/js/view/crm.designer.js | 2 +-
civicrm/js/wysiwyg/crm.ckeditor.js | 4 +-
civicrm/release-notes.md | 9 +++++
civicrm/release-notes/5.23.3.md | 39 +++++++++++++++++++
civicrm/sql/civicrm_data.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 2 +-
civicrm/templates/CRM/common/l10n.js.tpl | 4 +-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 +++----
civicrm/vendor/composer/autoload_static.php | 12 +++---
civicrm/xml/version.xml | 2 +-
17 files changed, 81 insertions(+), 32 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.23.3.mysql.tpl
create mode 100644 civicrm/release-notes/5.23.3.md
diff --git a/civicrm.php b/civicrm.php
index 9668c66463..2a9b62be1a 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.23.2
+Version: 5.23.3
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.2' );
+define( 'CIVICRM_PLUGIN_VERSION', '5.23.3' );
// 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/Upgrade/Incremental/sql/5.23.3.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.23.3.mysql.tpl
new file mode 100644
index 0000000000..5231df2bdb
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.23.3.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.23.3 during upgrade *}
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/civicrm-version.php b/civicrm/civicrm-version.php
index bbaea62ccd..41ef6084ca 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.23.2',
+ return array( 'version' => '5.23.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/js/jquery/jquery.crmEditable.js b/civicrm/js/jquery/jquery.crmEditable.js
index cfbdb446a4..b68b27f0a2 100644
--- a/civicrm/js/jquery/jquery.crmEditable.js
+++ b/civicrm/js/jquery/jquery.crmEditable.js
@@ -168,7 +168,7 @@
});
}
- CRM.loadScript(CRM.config.packagesBase.replace(/\/+$/, '') + '/jquery/plugins/jquery.jeditable.min.js').done(function() {
+ CRM.loadScript(CRM.config.packagesBase + 'jquery/plugins/jquery.jeditable.min.js').done(function() {
$i.editable(callback, settings);
});
diff --git a/civicrm/js/view/crm.designer.js b/civicrm/js/view/crm.designer.js
index ec3ae53c4f..9d43b92bf0 100644
--- a/civicrm/js/view/crm.designer.js
+++ b/civicrm/js/view/crm.designer.js
@@ -370,7 +370,7 @@
"theme": 'classic',
"dots": false,
"icons": false,
- "url": CRM.config.packagesBase.replace(/\/+$/, '') + '/jquery/plugins/jstree/themes/classic/style.css'
+ "url": CRM.config.packagesBase + 'jquery/plugins/jstree/themes/classic/style.css'
},
'plugins': ['themes', 'json_data', 'ui', 'search']
}).bind('loaded.jstree', function () {
diff --git a/civicrm/js/wysiwyg/crm.ckeditor.js b/civicrm/js/wysiwyg/crm.ckeditor.js
index b970da4568..59bf880df9 100644
--- a/civicrm/js/wysiwyg/crm.ckeditor.js
+++ b/civicrm/js/wysiwyg/crm.ckeditor.js
@@ -54,8 +54,8 @@
function initialize() {
var
- browseUrl = CRM.config.packagesBase.replace(/\/+$/, '') + "/kcfinder/browse.php?cms=civicrm",
- uploadUrl = CRM.config.packagesBase.replace(/\/+$/, '') + "/kcfinder/upload.php?cms=civicrm&format=json",
+ browseUrl = CRM.config.packagesBase + "kcfinder/browse.php?cms=civicrm",
+ uploadUrl = CRM.config.packagesBase + "kcfinder/upload.php?cms=civicrm&format=json",
preset = $(item).data('preset') || 'default',
// This variable is always an array but a legacy extension could be setting it as a string.
customConfig = (typeof CRM.config.CKEditorCustomConfig === 'string') ? CRM.config.CKEditorCustomConfig :
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index f54c8e35c6..778f9f6dd6 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.3
+
+Released March 16, 2020
+
+- **[Synopsis](release-notes/5.23.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.23.3.md#bugs)**
+- **[Credits](release-notes/5.23.3.md#credits)**
+- **[Feedback](release-notes/5.23.3.md#feedback)**
+
## CiviCRM 5.23.2
Released March 13, 2020
diff --git a/civicrm/release-notes/5.23.3.md b/civicrm/release-notes/5.23.3.md
new file mode 100644
index 0000000000..6cb408cba3
--- /dev/null
+++ b/civicrm/release-notes/5.23.3.md
@@ -0,0 +1,39 @@
+# CiviCRM 5.23.3
+
+Released March 16, 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
+
+* **_Various_: Fix certain malformed resource URLs ([dev/core#1651](https://lab.civicrm.org/dev/core/issues/1651): [#16791](https://github.com/civicrm/civicrm-core/pull/16791))**
+
+ The inline-editing UI, profile editing UI, and KCFinder UI each relied on a resource URL which regressed in 5.23.1.
+
+## <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 - Tim Otten
+
+## <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 73073c920c..bc0153f13b 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.2';
+UPDATE civicrm_domain SET version = '5.23.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index a22ff3a5f6..20a62e77ed 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.2',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.3',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/common/l10n.js.tpl b/civicrm/templates/CRM/common/l10n.js.tpl
index 74777751ae..fa49678644 100644
--- a/civicrm/templates/CRM/common/l10n.js.tpl
+++ b/civicrm/templates/CRM/common/l10n.js.tpl
@@ -12,8 +12,10 @@
(function($) {ldelim}
// Config settings
CRM.config.userFramework = {$config->userFramework|@json_encode};
+ {* resourceBase: The URL of `civicrm-core` assets. Ends with "/". *}
CRM.config.resourceBase = {$config->userFrameworkResourceURL|@json_encode};
- CRM.config.packagesBase = {capture assign=packagesBase}{crmResURL expr='[civicrm.packages]/.'}{/capture}{$packagesBase|@json_encode};
+ {* packageseBase: The URL of `civicrm-packages` assets. Ends with "/". *}
+ CRM.config.packagesBase = {capture assign=packagesBase}{crmResURL expr='[civicrm.packages]/'}{/capture}{$packagesBase|@json_encode};
CRM.config.lcMessages = {$config->lcMessages|@json_encode};
CRM.config.locale = {$locale|@json_encode};
CRM.config.cid = {$cid|@json_encode};
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index f6a23d4c2e..fcca4cccc0 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df::getLoader();
+return ComposerAutoloaderInit30ee554012b9f91d6abd374c8efeb936::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 1add9f3661..a6f91ea034 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 ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df
+class ComposerAutoloaderInit30ee554012b9f91d6abd374c8efeb936
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit30ee554012b9f91d6abd374c8efeb936', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit30ee554012b9f91d6abd374c8efeb936', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit134b6131df1d3c0a39c408823a9540df::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit134b6131df1d3c0a39c408823a9540df
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit134b6131df1d3c0a39c408823a9540df::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire134b6131df1d3c0a39c408823a9540df($fileIdentifier, $file);
+ composerRequire30ee554012b9f91d6abd374c8efeb936($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire134b6131df1d3c0a39c408823a9540df($fileIdentifier, $file)
+function composerRequire30ee554012b9f91d6abd374c8efeb936($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 2e54f47594..382e859893 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit134b6131df1d3c0a39c408823a9540df
+class ComposerStaticInit30ee554012b9f91d6abd374c8efeb936
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -476,11 +476,11 @@ class ComposerStaticInit134b6131df1d3c0a39c408823a9540df
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit134b6131df1d3c0a39c408823a9540df::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit134b6131df1d3c0a39c408823a9540df::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit134b6131df1d3c0a39c408823a9540df::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit134b6131df1d3c0a39c408823a9540df::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit134b6131df1d3c0a39c408823a9540df::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit30ee554012b9f91d6abd374c8efeb936::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 5a3f015ff2..549fc26d23 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.2</version_no>
+ <version_no>5.23.3</version_no>
</version>
--
GitLab