From 81823dc6a8f811a2b473aeba5884a32f446eab4f Mon Sep 17 00:00:00 2001
From: lucashedding <lucashedding@1463982.no-reply.drupal.org>
Date: Mon, 25 Nov 2019 11:47:47 -0600
Subject: [PATCH] Issue #3093866 by heddn, rkoller: Add a clickable link to the
readiness check status message right after the first install
---
automatic_updates.module | 1 -
src/ReadinessChecker/ReadinessCheckerManager.php | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/automatic_updates.module b/automatic_updates.module
index 3347ab426a..f37a9d2c6a 100644
--- a/automatic_updates.module
+++ b/automatic_updates.module
@@ -28,7 +28,6 @@ function automatic_updates_page_top(array &$page_top) {
'update.settings',
'system.status',
'update.confirmation_page',
- 'automatic_updates.settings',
];
// These routes don't need additional nagging.
if (in_array(\Drupal::routeMatch()->getRouteName(), $disabled_routes, TRUE)) {
diff --git a/src/ReadinessChecker/ReadinessCheckerManager.php b/src/ReadinessChecker/ReadinessCheckerManager.php
index e4732dc713..0ad6dd6baf 100644
--- a/src/ReadinessChecker/ReadinessCheckerManager.php
+++ b/src/ReadinessChecker/ReadinessCheckerManager.php
@@ -122,8 +122,9 @@ class ReadinessCheckerManager implements ReadinessCheckerManagerInterface {
foreach ($this->checkers as $category => $priorities) {
foreach ($priorities as $checkers) {
krsort($checkers);
- $sorted[$category] = isset($sorted[$category]) ? array_merge($sorted[$category], $checkers) : array_merge([], $checkers);
+ $sorted[$category][] = $checkers;
}
+ $sorted[$category] = array_merge(...$sorted[$category]);
}
return $sorted;
}
--
GitLab