diff -u b/core/modules/update/update.install b/core/modules/update/update.install
--- b/core/modules/update/update.install
+++ b/core/modules/update/update.install
@@ -5,7 +5,6 @@
* Install, update, and uninstall functions for the Update Manager module.
*/
-use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
/**
@@ -109,18 +108,16 @@
if ($status != UPDATE_CURRENT) {
$requirement['reason'] = $status;
$requirement['severity'] = REQUIREMENT_ERROR;
+ // Append the available updates link to the message from
+ // _update_message_text(), and format the two translated strings together in
+ // a single paragraph.
+ $requirement['description'][] = ['#markup' => _update_message_text($type, $status)];
if (update_manager_access()) {
- $available_updates_text = t('See the available updates page for more information and to install your missing updates.', array('@available_updates' => \Drupal::url('update.report_update')));
+ $requirement['description'][] = ['#markup' => t('See the available updates page for more information and to install your missing updates.', ['@available_updates' => \Drupal::url('update.report_update')])];
}
else {
- $available_updates_text = t('See the available updates page for more information.', array('@available_updates' => \Drupal::url('update.status')));
+ $requirement['description'][] = ['#markup' => t('See the available updates page for more information.', ['@available_updates' => \Drupal::url('update.status')])];
}
- // Append the available updates link to the message from
- // _update_message_text(), and format the two translated strings together in
- // a single paragraph.
- // @todo Evaluate whether to use a render array instead following
- // https://www.drupal.org/node/2505499.
- $requirement['description'] = SafeMarkup::format('@text @available_updates_text', ['@text' => _update_message_text($type, $status), '@available_updates_text' => $available_updates_text]);
}
switch ($status) {
case UPDATE_NOT_SECURE: