From de44e4a84aa3e84657bc1a8092c83abbab444ef2 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Tue, 18 Jun 2019 19:09:09 -0400
Subject: [PATCH] civicrm 5.14.1 release
Signed-off-by: Kevin Cristiano <kcristiano@kcristiano.com>
---
civicrm.php | 2 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 2 +-
civicrm/CRM/Activity/Form/Activity.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Invoice.php | 8 +++-
civicrm/CRM/Core/Page/File.php | 2 +-
civicrm/CRM/Report/Form.php | 11 -----
.../Upgrade/Incremental/sql/5.14.1.mysql.tpl | 1 +
civicrm/CRM/Utils/Check/Component.php | 10 +++--
civicrm/CRM/Utils/System/WordPress.php | 10 ++---
.../angular-jquery-dialog-service/.bower.json | 4 +-
.../package.json | 9 ++++
.../bower_components/jquery-ui/.bower.json | 2 +-
civicrm/civicrm-version.php | 2 +-
civicrm/release-notes.md | 9 ++++
civicrm/release-notes/5.14.0.md | 19 +++++----
civicrm/release-notes/5.14.1.md | 42 +++++++++++++++++++
civicrm/settings/Core.setting.php | 19 +++++++++
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 +-
23 files changed, 133 insertions(+), 57 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.14.1.mysql.tpl
create mode 100644 civicrm/bower_components/angular-jquery-dialog-service/package.json
create mode 100644 civicrm/release-notes/5.14.1.md
diff --git a/civicrm.php b/civicrm.php
index 8bc4567a4f..0d97ed32b3 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.14.0
+Version: 5.14.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/Activity/Form/Activity.php b/civicrm/CRM/Activity/Form/Activity.php
index a3fef8d7d8..976e4327ac 100644
--- a/civicrm/CRM/Activity/Form/Activity.php
+++ b/civicrm/CRM/Activity/Form/Activity.php
@@ -808,7 +808,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
'type' => 'upload',
'name' => ts('Save'),
'isDefault' => TRUE,
- 'submitOnce' => TRUE,
],
[
'type' => 'cancel',
@@ -892,9 +891,8 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
/**
* Process the form submission.
*
- *
* @param array $params
-
+ *
* @return array|null
* @throws \CiviCRM_API3_Exception
*/
diff --git a/civicrm/CRM/Contribute/Form/Task/Invoice.php b/civicrm/CRM/Contribute/Form/Task/Invoice.php
index 4d02644bd4..f2742ee109 100644
--- a/civicrm/CRM/Contribute/Form/Task/Invoice.php
+++ b/civicrm/CRM/Contribute/Form/Task/Invoice.php
@@ -301,7 +301,13 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
$invoiceDate = date("F j, Y");
$dueDate = date('F j, Y', strtotime($contributionReceiveDate . "+" . $prefixValue['due_date'] . "" . $prefixValue['due_date_period']));
- $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
+ if ($input['component'] == 'contribute') {
+ $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
+ }
+ else {
+ $eid = $contribution->_relatedObjects['participant']->id;
+ $lineItem = CRM_Price_BAO_LineItem::getLineItems($eid, 'participant', NULL, TRUE, FALSE, TRUE);
+ }
$resultPayments = civicrm_api3('Payment', 'get', [
'sequential' => 1,
diff --git a/civicrm/CRM/Core/Page/File.php b/civicrm/CRM/Core/Page/File.php
index c1f6cd10bf..8c35a9fc07 100644
--- a/civicrm/CRM/Core/Page/File.php
+++ b/civicrm/CRM/Core/Page/File.php
@@ -80,7 +80,7 @@ class CRM_Core_Page_File extends CRM_Core_Page {
}
$extension = CRM_Utils_File::getExtensionFromPath($path);
$candidateExtensions = CRM_Utils_File::getAcceptableExtensionsForMimeType($passedInMimeType);
- if (!in_array($extension, $candidateExtensions)) {
+ if (!in_array(strtolower($extension), array_map('strtolower', $candidateExtensions))) {
throw new CRM_Core_Exception("Supplied mime-type does not match file extension");
}
// Now that we have validated mime-type supplied as much as possible lets now set the MimeType variable/
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index 9510f28ded..8e36623d68 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.
*
@@ -2810,11 +2807,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');
}
@@ -3467,9 +3459,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.14.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.14.1.mysql.tpl
new file mode 100644
index 0000000000..478109c2ea
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.14.1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.14.1 during upgrade *}
diff --git a/civicrm/CRM/Utils/Check/Component.php b/civicrm/CRM/Utils/Check/Component.php
index 9b2a02938c..f07f2923fc 100644
--- a/civicrm/CRM/Utils/Check/Component.php
+++ b/civicrm/CRM/Utils/Check/Component.php
@@ -62,16 +62,20 @@ abstract class CRM_Utils_Check_Component {
* Check if file exists on given URL.
*
* @param string $url
- * @param float $timeout
+ * @param float|bool $timeoutOverride
*
* @return bool
*/
- public function fileExists($url, $timeout = 0.50) {
+ public function fileExists($url, $timeoutOverride = FALSE) {
+ // Timeout past in maybe 0 in which case we should still permit it (0 is infinite).
+ if (!$timeoutOverride && $timeoutOverride !== 0) {
+ $timeoutOverride = (float) Civi::settings()->get('http_timeout');
+ }
$fileExists = FALSE;
try {
$guzzleClient = new GuzzleHttp\Client();
$guzzleResponse = $guzzleClient->request('GET', $url, array(
- 'timeout' => $timeout,
+ 'timeout' => $timeoutOverride,
));
$fileExists = ($guzzleResponse->getStatusCode() == 200);
}
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index 182ad5a321..a1a9c64fd3 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -830,13 +830,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/bower_components/angular-jquery-dialog-service/.bower.json b/civicrm/bower_components/angular-jquery-dialog-service/.bower.json
index 8a7c9c7ef5..d3d7c85835 100644
--- a/civicrm/bower_components/angular-jquery-dialog-service/.bower.json
+++ b/civicrm/bower_components/angular-jquery-dialog-service/.bower.json
@@ -1,11 +1,11 @@
{
"name": "angular-jquery-dialog-service",
"homepage": "https://github.com/totten/angular-jquery-dialog-service",
- "_release": "8c5d302ce9",
+ "_release": "156e2f592f",
"_resolution": {
"type": "branch",
"branch": "civicrm",
- "commit": "8c5d302ce980e3e42410289f349a41f1608a08b5"
+ "commit": "156e2f592f8cadd83f89e4b4b84f13fe0c72d21b"
},
"_source": "https://github.com/totten/angular-jquery-dialog-service.git",
"_target": "civicrm",
diff --git a/civicrm/bower_components/angular-jquery-dialog-service/package.json b/civicrm/bower_components/angular-jquery-dialog-service/package.json
new file mode 100644
index 0000000000..e7cafd2154
--- /dev/null
+++ b/civicrm/bower_components/angular-jquery-dialog-service/package.json
@@ -0,0 +1,9 @@
+{
+ "name" : "angular-jquery-dialog-service",
+ "description": "An Angular.js service that allows you to easily work with jQuery UI dialogs.",
+ "homepage": "https://github.com/jwstadler/angular-jquery-dialog-service",
+ "author": "Jason Stadler",
+ "repository": {"type": "git", "url": "git://github.com/jwstadler/angular-jquery-dialog-service.git"},
+ "main": "dialog-service.js",
+ "version": "0.8.1"
+}
diff --git a/civicrm/bower_components/jquery-ui/.bower.json b/civicrm/bower_components/jquery-ui/.bower.json
index d28097dd88..a37977e293 100644
--- a/civicrm/bower_components/jquery-ui/.bower.json
+++ b/civicrm/bower_components/jquery-ui/.bower.json
@@ -17,6 +17,6 @@
"commit": "44ecf3794cc56b65954cc19737234a3119d036cc"
},
"_source": "https://github.com/components/jqueryui.git",
- "_target": "~1.12",
+ "_target": ">=1.9",
"_originalSource": "jquery-ui"
}
\ No newline at end of file
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 8ff0817869..f04a009c12 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.14.0',
+ return array( 'version' => '5.14.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index f9756c2562..3c1a733d12 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -14,6 +14,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.14.1
+
+Released June 17, 2019
+
+- **[Synopsis](release-notes/5.14.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.14.1.md#bugs)**
+- **[Credits](release-notes/5.14.1.md#credits)**
+- **[Feedback](release-notes/5.14.1.md#feedback)**
+
## CiviCRM 5.14.0
Released June 5, 2019
diff --git a/civicrm/release-notes/5.14.0.md b/civicrm/release-notes/5.14.0.md
index 11b3008da7..09390b02b8 100644
--- a/civicrm/release-notes/5.14.0.md
+++ b/civicrm/release-notes/5.14.0.md
@@ -526,15 +526,16 @@ Released June 5, 2019
This release was developed by the following code authors:
-AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Alok Patel; Australian
-Greens - Seamus Lee; Christian Wach; CiviCRM - Coleman Watts, Tim Otten;
-CiviDesk - Yashodha Chaku; Coop SymbioTIC - Mathieu Lutfy; Dave D; Electronic
-Frontier Foundation - Mark Burdett; Freeform Solutions - Herb van den Dool;
-Fuzion - Luke Stewart; Guillaume Rischard; JMA Consulting - Monish Deb; John
-Kingsnorth; Korlon - Stuart Gaston; Lighthouse Design and Consulting - Brian
-Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MJW Consulting -
-Matthew Wire; Pradeep Nayak; Squiffle Consulting - Aidan Saunders; Tadpole
-Collective - Kevin Cristiano; Wikimedia Foundation - Eileen McNaughton
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Alok Patel, Francis
+Whittle; Australian Greens - Seamus Lee; Christian Wach; CiviCRM - Coleman
+Watts, Tim Otten; CiviDesk - Yashodha Chaku; Coop SymbioTIC - Mathieu Lutfy;
+Dave D; Electronic Frontier Foundation - Mark Burdett; Freeform Solutions -
+Herb van den Dool; Fuzion - Luke Stewart; Guillaume Rischard; JMA Consulting -
+Monish Deb; John Kingsnorth; Korlon - Stuart Gaston; Lighthouse Design and
+Consulting - Brian Shaughnessy; Megaphone Technology Consulting - Jon
+Goldberg; MJW Consulting - Matthew Wire; Pradeep Nayak; Squiffle Consulting -
+Aidan Saunders; Tadpole Collective - Kevin Cristiano; Wikimedia Foundation -
+Eileen McNaughton
Most authors also reviewed code for this release; in addition, the following
reviewers contributed their comments:
diff --git a/civicrm/release-notes/5.14.1.md b/civicrm/release-notes/5.14.1.md
new file mode 100644
index 0000000000..5f1eee8566
--- /dev/null
+++ b/civicrm/release-notes/5.14.1.md
@@ -0,0 +1,42 @@
+# CiviCRM 5.14.1
+
+Released June 17, 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
+
+- **Activities: Temporarily revert "submit once" change ([dev/core#1045](https://lab.civicrm.org/dev/core/issues/1045), [dev/core#943](https://lab.civicrm.org/dev/core/issues/943),
+ [dev/core#914](https://lab.civicrm.org/dev/core/issues/914): backport [#14545](https://github.com/civicrm/civicrm-core/pull/14545))**
+- **Contacts: Error showing some uploaded images ([dev/core#1044](https://lab.civicrm.org/dev/core/issues/1044): backport [#14554](https://github.com/civicrm/civicrm-core/pull/14554))**
+- **Status Check: Mitigate timeout in Resource URL check ([dev/core#1035](https://lab.civicrm.org/dev/core/issues/1035): backport [#14525](https://github.com/civicrm/civicrm-core/pull/14525))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Steve Ellis; Progressive Technology
+Project - Jamie McClelland; MJW Consulting - Matthew Wire; JGaunt;
+Greenpeace CEE - Patrick Figel; Dave D; CiviCRM - Coleman Watts, Tim Otten;
+Australian Greens - Seamus Lee; Andrew Thompson; 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`.
diff --git a/civicrm/settings/Core.setting.php b/civicrm/settings/Core.setting.php
index cc69e3f982..274706f5d8 100644
--- a/civicrm/settings/Core.setting.php
+++ b/civicrm/settings/Core.setting.php
@@ -1066,4 +1066,23 @@ return [
'description' => ts('Acceptable Mime Types that can be used as part of file urls'),
'help_text' => NULL,
],
+ 'http_timeout' => [
+ 'group_name' => 'CiviCRM Preferences',
+ 'group' => 'core',
+ 'name' => 'http_timeout',
+ 'type' => 'Integer',
+ 'quick_form_type' => 'Element',
+ 'html_type' => 'text',
+ 'html_attributes' => [
+ 'size' => 2,
+ 'maxlength' => 3,
+ ],
+ 'default' => 5,
+ 'add' => '5.14',
+ 'title' => ts('HTTP request timeout'),
+ 'is_domain' => 1,
+ 'is_contact' => 0,
+ 'description' => ts('How long should HTTP requests through Guzzle application run for in seconds'),
+ 'help_text' => ts('Set the number of seconds http requests should run for before terminating'),
+ ],
];
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 74967271d0..8267e33e4f 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -24036,4 +24036,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.14.0';
+UPDATE civicrm_domain SET version = '5.14.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 68573145ee..dc1e32c751 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`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.14.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.14.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 1dd5edc393..8244fe5c85 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c::getLoader();
+return ComposerAutoloaderInit20ef2cc289198584e1cd62ef6c06974c::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index f2d3d8865d..9fccfd03ce 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 ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c
+class ComposerAutoloaderInit20ef2cc289198584e1cd62ef6c06974c
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit20ef2cc289198584e1cd62ef6c06974c', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit20ef2cc289198584e1cd62ef6c06974c', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit188b9eabfe4090f2e62fb6879322428c
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire188b9eabfe4090f2e62fb6879322428c($fileIdentifier, $file);
+ composerRequire20ef2cc289198584e1cd62ef6c06974c($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire188b9eabfe4090f2e62fb6879322428c($fileIdentifier, $file)
+function composerRequire20ef2cc289198584e1cd62ef6c06974c($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 b244de6374..991b36ad0a 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit188b9eabfe4090f2e62fb6879322428c
+class ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -432,11 +432,11 @@ class ComposerStaticInit188b9eabfe4090f2e62fb6879322428c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit188b9eabfe4090f2e62fb6879322428c::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit20ef2cc289198584e1cd62ef6c06974c::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index e259b1857e..93dc0f4330 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.14.0</version_no>
+ <version_no>5.14.1</version_no>
</version>
--
GitLab