From bdfe5ae7ba1a962bb417aa5e7dabbe1b85cc689f Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Wed, 14 Aug 2019 07:22:27 -0400
Subject: [PATCH] CiviCRM 5.16.1 release
---
civicrm.php | 2 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 2 +-
civicrm/CRM/Core/DAO.php | 2 +-
civicrm/CRM/Report/Form.php | 11 ------
.../Upgrade/Incremental/sql/5.16.1.mysql.tpl | 1 +
civicrm/CRM/Utils/System/WordPress.php | 10 ++---
civicrm/civicrm-version.php | 2 +-
civicrm/js/crm.menubar.js | 4 +-
civicrm/release-notes.md | 9 +++++
civicrm/release-notes/5.16.1.md | 38 +++++++++++++++++++
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, 75 insertions(+), 40 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.16.1.mysql.tpl
create mode 100644 civicrm/release-notes/5.16.1.md
diff --git a/civicrm.php b/civicrm.php
index 26a1e3bf30..f40643b409 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.16.0
+Version: 5.16.1
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress
diff --git a/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index bad293c934..65191fb979 100644
--- a/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -54,7 +54,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/DAO.php b/civicrm/CRM/Core/DAO.php
index 5eb4713b8f..74e0ec7423 100644
--- a/civicrm/CRM/Core/DAO.php
+++ b/civicrm/CRM/Core/DAO.php
@@ -1512,7 +1512,7 @@ FROM civicrm_domain
* @return string
* @throws Exception
*/
- public static function composeQuery($query, $params, $abort = TRUE) {
+ public static function composeQuery($query, $params = [], $abort = TRUE) {
$tr = [];
foreach ($params as $key => $item) {
if (is_numeric($key)) {
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index 0687af7c4c..eff1db9aef 100644
--- a/civicrm/CRM/Report/Form.php
+++ b/civicrm/CRM/Report/Form.php
@@ -155,9 +155,6 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
protected $_groupFilter = FALSE;
- // [ML] Required for civiexportexcel
- public $supportsExportExcel = TRUE;
-
/**
* Has the report been optimised for group filtering.
*
@@ -2845,11 +2842,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 == 'group') {
$this->assign('outputMode', 'group');
}
@@ -3502,9 +3494,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.16.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.16.1.mysql.tpl
new file mode 100644
index 0000000000..138dc40f2a
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.16.1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.16.1 during upgrade *}
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index d841ba15d8..bf35954360 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -827,13 +827,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 ed175082df..f7d44279e8 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.16.0',
+ return array( 'version' => '5.16.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/js/crm.menubar.js b/civicrm/js/crm.menubar.js
index bd42b8992f..152a6e376e 100644
--- a/civicrm/js/crm.menubar.js
+++ b/civicrm/js/crm.menubar.js
@@ -27,13 +27,13 @@
// Wait for crm-container present on the page as it's faster than document.ready
function insert(markup) {
- if ($('.crm-container').length) {
+ if ($('#crm-container').length) {
render(markup);
} else {
new MutationObserver(function(mutations, observer) {
_.each(mutations, function(mutant) {
_.each(mutant.addedNodes, function(node) {
- if ($(node).is('.crm-container')) {
+ if ($(node).is('#crm-container')) {
render(markup);
observer.disconnect();
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index e5614b4ee1..92491cc913 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.16.1
+
+Released August 12, 2019
+
+- **[Synopsis](release-notes/5.16.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.16.1.md#bugs)**
+- **[Credits](release-notes/5.16.1.md#credits)**
+- **[Feedback](release-notes/5.16.1.md#feedback)**
+
## CiviCRM 5.16.0
Released August 7, 2019
diff --git a/civicrm/release-notes/5.16.1.md b/civicrm/release-notes/5.16.1.md
new file mode 100644
index 0000000000..7b4e396c21
--- /dev/null
+++ b/civicrm/release-notes/5.16.1.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.16.1
+
+Released August 12, 2019
+
+- **[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
+
+- **_Custom Search_: Resolve PHP fatal error ([dev/core#1175](https://lab.civicrm.org/dev/core/issues/1175): [#15009](https://github.com/civicrm/civicrm-core/pull/15009))**
+- **_Menus_: Menubar may not show up after clearing cache ([dev/core#1182](https://lab.civicrm.org/dev/core/issues/1182): [#15022](https://github.com/civicrm/civicrm-core/pull/15022))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Megaphone Technology Consulting - Jon Goldberg; CiviCRM - Colemann Watts;
+Australian Greens - Seamus Lee
+
+## <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 d59c6fcd57..0980d734e5 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -24049,4 +24049,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.16.0';
+UPDATE civicrm_domain SET version = '5.16.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 021ae6c8b1..1c6359aaf0 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -398,7 +398,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.16.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.16.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 cd18aa1210..dd83fdd9d3 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717::getLoader();
+return ComposerAutoloaderInit7bb3c5366400cb99e3cf62594dd04869::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 7d70d1d1f1..b0dc9f21fd 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 ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717
+class ComposerAutoloaderInit7bb3c5366400cb99e3cf62594dd04869
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit7bb3c5366400cb99e3cf62594dd04869', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit7bb3c5366400cb99e3cf62594dd04869', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitd5a4836e150dcf81a7364359449f0717::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInitd5a4836e150dcf81a7364359449f0717
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitd5a4836e150dcf81a7364359449f0717::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequired5a4836e150dcf81a7364359449f0717($fileIdentifier, $file);
+ composerRequire7bb3c5366400cb99e3cf62594dd04869($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequired5a4836e150dcf81a7364359449f0717($fileIdentifier, $file)
+function composerRequire7bb3c5366400cb99e3cf62594dd04869($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 86f3fc03d8..71efb86ed9 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitd5a4836e150dcf81a7364359449f0717
+class ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -456,11 +456,11 @@ class ComposerStaticInitd5a4836e150dcf81a7364359449f0717
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitd5a4836e150dcf81a7364359449f0717::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitd5a4836e150dcf81a7364359449f0717::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitd5a4836e150dcf81a7364359449f0717::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitd5a4836e150dcf81a7364359449f0717::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitd5a4836e150dcf81a7364359449f0717::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit7bb3c5366400cb99e3cf62594dd04869::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index fb21c80299..381bae9579 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.16.0</version_no>
+ <version_no>5.16.1</version_no>
</version>
--
GitLab