From a3433391e7fa3b84102cefa0ffecfb4f30b4cf3e Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Mon, 24 Jul 2023 18:53:37 +1000
Subject: [PATCH] Revert "Issue #3376376:
HelpSectionManager::clearCachedDefinitions breaks the update system"
This reverts commit e482afdd29abf91ddf348092cdbc91c0d5efcec2.
---
core/modules/help/help.module | 14 +-------------
core/modules/help/src/HelpSectionManager.php | 3 ++-
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 444cac5af62c..5d5e24a6b182 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -148,7 +148,7 @@ function _help_search_update(array $extensions = []): void {
return;
}
- if (_help_is_fully_installed()) {
+ if (\Drupal::service('update.update_hook_registry')->getInstalledVersion('help') >= 10100) {
// Ensure that topics for extensions that have been uninstalled are removed
// and that the index state variable is updated.
$help_search = \Drupal::service('plugin.manager.search')->createInstance('help_search');
@@ -156,15 +156,3 @@ function _help_search_update(array $extensions = []): void {
$help_search->updateIndexState();
}
}
-
-/**
- * Checks whether the help module installation is complete.
- *
- * @return bool
- *
- * @see \help_update_10200()
- */
-function _help_is_fully_installed(): bool {
- return \Drupal::service('update.update_hook_registry')
- ->getInstalledVersion('help') >= 10200;
-}
diff --git a/core/modules/help/src/HelpSectionManager.php b/core/modules/help/src/HelpSectionManager.php
index 916091b56744..d8037e5082b7 100644
--- a/core/modules/help/src/HelpSectionManager.php
+++ b/core/modules/help/src/HelpSectionManager.php
@@ -57,7 +57,8 @@ public function setSearchManager(?PluginManagerInterface $search_manager = NULL)
*/
public function clearCachedDefinitions() {
parent::clearCachedDefinitions();
- if ($this->searchManager && _help_is_fully_installed()) {
+ $version = \Drupal::service('update.update_hook_registry')->getInstalledVersion('help');
+ if ($this->searchManager && $version >= 10100) {
// Rebuild the index on cache clear so that new help topics are indexed
// and any changes due to help topics edits or translation changes are
// picked up.
--
GitLab