updated core to 8.6.1 via composer
This commit is contained in:
@@ -185,17 +185,18 @@ function update_page_top() {
|
||||
foreach (['core', 'contrib'] as $report_type) {
|
||||
$type = 'update_' . $report_type;
|
||||
// hook_requirements() supports render arrays therefore we need to render
|
||||
// them before using drupal_set_message().
|
||||
// them before using
|
||||
// \Drupal\Core\Messenger\MessengerInterface::addStatus().
|
||||
if (isset($status[$type]['description']) && is_array($status[$type]['description'])) {
|
||||
$status[$type]['description'] = \Drupal::service('renderer')->renderPlain($status[$type]['description']);
|
||||
}
|
||||
if (!empty($verbose)) {
|
||||
if (isset($status[$type]['severity'])) {
|
||||
if ($status[$type]['severity'] == REQUIREMENT_ERROR) {
|
||||
drupal_set_message($status[$type]['description'], 'error');
|
||||
\Drupal::messenger()->addError($status[$type]['description']);
|
||||
}
|
||||
elseif ($status[$type]['severity'] == REQUIREMENT_WARNING) {
|
||||
drupal_set_message($status[$type]['description'], 'warning');
|
||||
\Drupal::messenger()->addWarning($status[$type]['description']);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -205,7 +206,7 @@ function update_page_top() {
|
||||
if (isset($status[$type])
|
||||
&& isset($status[$type]['reason'])
|
||||
&& $status[$type]['reason'] === UPDATE_NOT_SECURE) {
|
||||
drupal_set_message($status[$type]['description'], 'error');
|
||||
\Drupal::messenger()->addError($status[$type]['description']);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -407,6 +408,45 @@ function update_get_available($refresh = FALSE) {
|
||||
return $available;
|
||||
}
|
||||
|
||||
/**
|
||||
* Identifies equivalent security releases with a hardcoded list.
|
||||
*
|
||||
* Generally, only the latest minor version of Drupal 8 is supported. However,
|
||||
* when security fixes are backported to an old branch, and the site owner
|
||||
* updates to the release containing the backported fix, they should not
|
||||
* see "Security update required!" again if the only other security releases
|
||||
* are releases for the same advisories.
|
||||
*
|
||||
* @return string[]
|
||||
* A list of security release numbers that are equivalent to this release
|
||||
* (i.e. covered by the same advisory), for backported security fixes only.
|
||||
*
|
||||
* @internal
|
||||
*
|
||||
* @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use the
|
||||
* 'Insecure' release type tag in update XML provided by Drupal.org to
|
||||
* determine if releases are insecure.
|
||||
*/
|
||||
function _update_equivalent_security_releases() {
|
||||
trigger_error("_update_equivalent_security_releases() was a temporary fix and will be removed before 9.0.0. Use the 'Insecure' release type tag in update XML provided by Drupal.org to determine if releases are insecure.", E_USER_DEPRECATED);
|
||||
switch (\Drupal::VERSION) {
|
||||
case '8.3.8':
|
||||
return ['8.4.5', '8.5.0-rc1'];
|
||||
case '8.3.9':
|
||||
return ['8.4.6', '8.5.1'];
|
||||
case '8.4.5':
|
||||
return ['8.5.0-rc1'];
|
||||
case '8.4.6':
|
||||
return ['8.5.1'];
|
||||
case '8.4.7':
|
||||
return ['8.5.2'];
|
||||
case '8.4.8':
|
||||
return ['8.5.3'];
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a task to the queue for fetching release history data for a project.
|
||||
*
|
||||
@@ -455,15 +495,15 @@ function update_fetch_data_finished($success, $results) {
|
||||
if ($success) {
|
||||
if (!empty($results)) {
|
||||
if (!empty($results['updated'])) {
|
||||
drupal_set_message(\Drupal::translation()->formatPlural($results['updated'], 'Checked available update data for one project.', 'Checked available update data for @count projects.'));
|
||||
\Drupal::messenger()->addStatus(\Drupal::translation()->formatPlural($results['updated'], 'Checked available update data for one project.', 'Checked available update data for @count projects.'));
|
||||
}
|
||||
if (!empty($results['failures'])) {
|
||||
drupal_set_message(\Drupal::translation()->formatPlural($results['failures'], 'Failed to get available update data for one project.', 'Failed to get available update data for @count projects.'), 'error');
|
||||
\Drupal::messenger()->addError(\Drupal::translation()->formatPlural($results['failures'], 'Failed to get available update data for one project.', 'Failed to get available update data for @count projects.'));
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
drupal_set_message(t('An error occurred trying to get available update data.'), 'error');
|
||||
\Drupal::messenger()->addError(t('An error occurred trying to get available update data.'), 'error');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -625,7 +665,6 @@ function template_preprocess_update_last_check(&$variables) {
|
||||
* version of Drupal core.
|
||||
*
|
||||
* @see \Drupal\Core\Extension\ExtensionDiscovery
|
||||
* @see _system_rebuild_module_data()
|
||||
*/
|
||||
function update_verify_update_archive($project, $archive_file, $directory) {
|
||||
$errors = [];
|
||||
|
||||
Reference in New Issue
Block a user