diff --git a/core/modules/help/help.module b/core/modules/help/help.module index 84eaf5482b70c2f17e5e5b01e389e37ceec75111..659ad8d94172291d44f905b7ec27ed9261680f43 100644 --- a/core/modules/help/help.module +++ b/core/modules/help/help.module @@ -148,11 +148,9 @@ function _help_search_update(array $extensions = []): void { return; } - if (\Drupal::service('update.update_hook_registry')->getInstalledVersion('help') >= 10200) { - // 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'); - $help_search->updateTopicList(); - $help_search->updateIndexState(); - } + // 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'); + $help_search->updateTopicList(); + $help_search->updateIndexState(); } diff --git a/core/modules/help/src/HelpSectionManager.php b/core/modules/help/src/HelpSectionManager.php index 656ab14dc1998fd3a6492c52f06324a622b72bc5..2ef90d9e331ad2486b534cf0a095f9f48ad8050e 100644 --- a/core/modules/help/src/HelpSectionManager.php +++ b/core/modules/help/src/HelpSectionManager.php @@ -58,8 +58,9 @@ public function setSearchManager(?PluginManagerInterface $search_manager = NULL) */ public function clearCachedDefinitions() { parent::clearCachedDefinitions(); - $version = \Drupal::service('update.update_hook_registry')->getInstalledVersion('help'); - if ($this->searchManager && $version >= 10200) { + // Search module may be missing. Help module might be installing, + // so its search plugin may not be discovered yet. + if ($this->searchManager && $this->searchManager->hasDefinition('help_search')) { // 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.