Skip to content
Snippets Groups Projects
Verified Commit e482afdd authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3376376: HelpSectionManager::clearCachedDefinitions breaks the update system

parent b28e3b76
No related branches found
No related tags found
43 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4594Applying patch for Views Global Text area field to allow extra HTML tags. As video, source and iframe tag is not rendering. Due to which Media embedded video and remote-video not rendering in Views Global Text area field.,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3546refactored dialog.pcss file,!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3502Issue #3335308: Confusing behavior with FormState::setFormState and FormState::setMethod,!3452Issue #3332701: Refactor Claro's tablesort-indicator stylesheet,!3451Issue #2410579: Allows setting the current language programmatically.,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3147Issue #3328457: Replace most substr($a, $i) where $i is negative with str_ends_with(),!3146Issue #3328456: Replace substr($a, 0, $i) with str_starts_with(),!3133core/modules/system/css/components/hidden.module.css,!31312878513-10.1.x,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2614Issue #2981326: Replace non-test usages of \Drupal::logger() with IoC injection,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!844Resolve #3036010 "Updaters",!673Issue #3214208: FinishResponseSubscriber could create duplicate headers,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/modules/help/help.module
+ 13
− 1
View file @ e482afdd
...@@ -148,7 +148,7 @@ function _help_search_update(array $extensions = []): void { ...@@ -148,7 +148,7 @@ function _help_search_update(array $extensions = []): void {
return; return;
} }
if (\Drupal::service('update.update_hook_registry')->getInstalledVersion('help') >= 10100) { if (_help_is_fully_installed()) {
// Ensure that topics for extensions that have been uninstalled are removed // Ensure that topics for extensions that have been uninstalled are removed
// and that the index state variable is updated. // and that the index state variable is updated.
$help_search = \Drupal::service('plugin.manager.search')->createInstance('help_search'); $help_search = \Drupal::service('plugin.manager.search')->createInstance('help_search');
...@@ -156,3 +156,15 @@ function _help_search_update(array $extensions = []): void { ...@@ -156,3 +156,15 @@ function _help_search_update(array $extensions = []): void {
$help_search->updateIndexState(); $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;
}
core/modules/help/src/HelpSectionManager.php
+ 1
− 2
View file @ e482afdd
...@@ -57,8 +57,7 @@ public function setSearchManager(?PluginManagerInterface $search_manager = NULL) ...@@ -57,8 +57,7 @@ public function setSearchManager(?PluginManagerInterface $search_manager = NULL)
*/ */
public function clearCachedDefinitions() { public function clearCachedDefinitions() {
parent::clearCachedDefinitions(); parent::clearCachedDefinitions();
$version = \Drupal::service('update.update_hook_registry')->getInstalledVersion('help'); if ($this->searchManager && _help_is_fully_installed()) {
if ($this->searchManager && $version >= 10100) {
// Rebuild the index on cache clear so that new help topics are indexed // 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 // and any changes due to help topics edits or translation changes are
// picked up. // picked up.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment