diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 542e0c5..7e0345f 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -10,7 +10,6 @@
* the module and theme pages, and optionally via email. It also provides the
* ability to install contributed modules and themes via an user interface.
*/
-
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\Core\Form\FormStateInterface;
@@ -23,47 +22,47 @@
/**
* Project is missing security update(s).
*/
-const UPDATE_NOT_SECURE = 1;
+ const UPDATE_NOT_SECURE = 1;
/**
* Current release has been unpublished and is no longer available.
*/
-const UPDATE_REVOKED = 2;
+ const UPDATE_REVOKED = 2;
/**
* Current release is no longer supported by the project maintainer.
*/
-const UPDATE_NOT_SUPPORTED = 3;
+ const UPDATE_NOT_SUPPORTED = 3;
/**
* Project has a new release available, but it is not a security release.
*/
-const UPDATE_NOT_CURRENT = 4;
+ const UPDATE_NOT_CURRENT = 4;
/**
* Project is up to date.
*/
-const UPDATE_CURRENT = 5;
+ const UPDATE_CURRENT = 5;
/**
* Project's status cannot be checked.
*/
-const UPDATE_NOT_CHECKED = -1;
+ const UPDATE_NOT_CHECKED = -1;
/**
* No available update data was found for project.
*/
-const UPDATE_UNKNOWN = -2;
+ const UPDATE_UNKNOWN = -2;
/**
* There was a failure fetching available update data for this project.
*/
-const UPDATE_NOT_FETCHED = -3;
+ const UPDATE_NOT_FETCHED = -3;
/**
* We need to (re)fetch available update data for this project.
*/
-const UPDATE_FETCH_PENDING = -4;
+ const UPDATE_FETCH_PENDING = -4;
/**
* Implements hook_help().
@@ -74,9 +73,9 @@ function update_help($route_name, RouteMatchInterface $route_match) {
$output = '';
$output .= '' . t('About') . '
';
$output .= '' . t("The Update Manager module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts administrators to available updates. In order to provide update information, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update Manager module from the Module administration page. For more information, see the online handbook entry for Update Manager module.", [
- '@update' => 'http://drupal.org/documentation/modules/update',
- '@modules' => \Drupal::url('system.modules_list'),
- ]) . '
';
+ '@update' => 'http://drupal.org/documentation/modules/update',
+ '@modules' => \Drupal::url('system.modules_list'),
+ ]) . '';
// Only explain the Update manager if it has not been disabled.
if (update_manager_access()) {
$output .= '' . t('The Update manager also allows administrators to update and install modules and themes through the administration interface.') . '
';
@@ -85,25 +84,25 @@ function update_help($route_name, RouteMatchInterface $route_match) {
$output .= '';
$output .= '- ' . t('Checking for available updates') . '
';
$output .= '- ' . t('A report of available updates will alert you when new releases are available for download. You may configure options for the frequency for checking updates (which are performed during cron runs) and email notifications at the Update Manager settings page.', [
- '@update-report' => \Drupal::url('update.status'),
- '@cron' => 'http://drupal.org/cron',
- '@update-settings' => \Drupal::url('update.settings'),
- ]) . '
';
+ '@update-report' => \Drupal::url('update.status'),
+ '@cron' => 'http://drupal.org/cron',
+ '@update-settings' => \Drupal::url('update.settings'),
+ ]) . '';
// Only explain the Update manager if it has not been disabled.
if (update_manager_access()) {
$output .= '- ' . t('Performing updates through the user interface') . '
';
$output .= '- ' . t('The Update Manager module allows administrators to perform updates directly through the administration interface. At the top of the modules and themes pages you will see a link to update to new releases. This will direct you to the update page where you see a listing of all the missing updates and confirm which ones you want to upgrade. From there, you are prompted for your FTP/SSH password, which then transfers the files into your Drupal installation, overwriting your old files. More detailed instructions can be found in the online handbook.', [
- '@modules_page' => \Drupal::url('system.modules_list'),
- '@themes_page' => \Drupal::url('system.themes_page'),
- '@update-page' => \Drupal::url('update.report_update'),
- '@update' => 'http://drupal.org/documentation/modules/update',
- ]) . '
';
+ '@modules_page' => \Drupal::url('system.modules_list'),
+ '@themes_page' => \Drupal::url('system.themes_page'),
+ '@update-page' => \Drupal::url('update.report_update'),
+ '@update' => 'http://drupal.org/documentation/modules/update',
+ ]) . '';
$output .= '- ' . t('Installing new modules and themes through the user interface') . '
';
$output .= '- ' . t('You can also install new modules and themes in the same fashion, through the install page, or by clicking the Install new module/theme link at the top of the modules and themes pages. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', [
- '@modules_page' => \Drupal::url('system.modules_list'),
- '@themes_page' => \Drupal::url('system.themes_page'),
- '@install' => \Drupal::url('update.report_install'),
- ]) . '
';
+ '@modules_page' => \Drupal::url('system.modules_list'),
+ '@themes_page' => \Drupal::url('system.themes_page'),
+ '@install' => \Drupal::url('update.report_install'),
+ ]) . '';
}
$output .= '
';
return $output;
@@ -141,7 +140,6 @@ function update_page_top() {
case 'system.modules_list':
$verbose = TRUE;
break;
-
}
module_load_install('update');
$status = update_requirements('runtime');
@@ -160,9 +158,7 @@ function update_page_top() {
// Otherwise, if we're on *any* admin page and there's a security
// update missing, print an error message about it.
else {
- if (isset($status[$type])
- && isset($status[$type]['reason'])
- && $status[$type]['reason'] === UPDATE_NOT_SECURE) {
+ if (isset($status[$type]) && isset($status[$type]['reason']) && $status[$type]['reason'] === UPDATE_NOT_SECURE) {
drupal_set_message($status[$type]['description'], 'error');
}
}
@@ -218,7 +214,7 @@ function update_cron() {
$update_config = \Drupal::config('update.settings');
$frequency = $update_config->get('check.interval_days');
$interval = 60 * 60 * 24 * $frequency;
- $last_check = \Drupal::state()->get('update.last_check') ?: 0;
+ $last_check = \Drupal::state()->get('update.last_check') ? : 0;
if ((REQUEST_TIME - $last_check) > $interval) {
// If the configured update interval has elapsed, we want to invalidate
// the data for all projects, attempt to re-fetch, and trigger any
@@ -231,7 +227,7 @@ function update_cron() {
// missing data, and if so, try to fetch the data.
update_get_available(TRUE);
}
- $last_email_notice = \Drupal::state()->get('update.last_email_notification') ?: 0;
+ $last_email_notice = \Drupal::state()->get('update.last_email_notification') ? : 0;
if ((REQUEST_TIME - $last_email_notice) > $interval) {
// If configured time between notifications elapsed, send email about
// updates possibly available.
@@ -383,12 +379,9 @@ function update_create_fetch_task($project) {
/**
* Refreshes the release data after loading the necessary include file.
- *
- * @see _update_refresh()
*/
function update_refresh() {
- module_load_include('inc', 'update', 'update.fetch');
- _update_refresh();
+ \Drupal::service('update.manager')->refreshUpdateData();
}
/**
@@ -610,11 +603,7 @@ function update_verify_update_archive($project, $archive_file, $directory) {
// Make sure this isn't a tarball of Drupal core.
if (
- file_exists("$directory/$project/index.php")
- && file_exists("$directory/$project/core/install.php")
- && file_exists("$directory/$project/core/includes/bootstrap.inc")
- && file_exists("$directory/$project/core/modules/node/node.module")
- && file_exists("$directory/$project/core/modules/system/system.module")
+ file_exists("$directory/$project/index.php") && file_exists("$directory/$project/core/install.php") && file_exists("$directory/$project/core/includes/bootstrap.inc") && file_exists("$directory/$project/core/modules/node/node.module") && file_exists("$directory/$project/core/modules/system/system.module")
) {
return array(
'no-core' => t('Automatic updating of Drupal core is not supported. See the upgrade guide for information on how to update Drupal core manually.', array('@upgrade-guide' => 'http://drupal.org/upgrade')),
@@ -648,10 +637,7 @@ function update_verify_update_archive($project, $archive_file, $directory) {
}
elseif (!$compatible_project) {
$errors[] = format_plural(
- count($incompatible),
- '%archive_file contains a version of %names that is not compatible with Drupal !version.',
- '%archive_file contains versions of modules or themes that are not compatible with Drupal !version: %names',
- array('!version' => \Drupal::CORE_COMPATIBILITY, '%archive_file' => drupal_basename($archive_file), '%names' => implode(', ', $incompatible))
+ count($incompatible), '%archive_file contains a version of %names that is not compatible with Drupal !version.', '%archive_file contains versions of modules or themes that are not compatible with Drupal !version: %names', array('!version' => \Drupal::CORE_COMPATIBILITY, '%archive_file' => drupal_basename($archive_file), '%names' => implode(', ', $incompatible))
);
}