Skip to content
Snippets Groups Projects
Commit 6c232829 authored by Divyansh Gupta's avatar Divyansh Gupta Committed by Kris Booghmans
Browse files

Issue #3507651 by divyansh.gupta, kriboogh, svendecabooter, dhruv.mittal: Error on "Add block" link

parent ce561c53
No related branches found
No related tags found
1 merge request!6Issue#3507651: Fix the error on Add block.
Pipeline #476429 passed with warnings
......@@ -5,6 +5,7 @@
* Primary module hooks for navigation module.
*/
use Drupal\Component\Utility\DeprecationHelper;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Component\Plugin\PluginBase;
use Drupal\navigation\Plugin\SectionStorage\NavigationSectionStorage;
......@@ -77,9 +78,22 @@ function navigation_extra_plugin_filter_block__layout_builder_alter(array &$defi
return in_array($base_plugin_id, $navigation_safe, TRUE);
}, ARRAY_FILTER_USE_BOTH);
// Call the original core navigation hook. It will remove our definitions.
// @phpstan-ignore-next-line
navigation_plugin_filter_block__layout_builder_alter($definitions, $extra);
// Ensure compatibility with Drupal 11.
DeprecationHelper::backwardsCompatibleCall(
currentVersion: \Drupal::VERSION,
deprecatedVersion: '10.3',
currentCallable: function() use (&$definitions, $extra) {
if (class_exists('\Drupal\navigation\Hook\NavigationHooks')) {
$navigation_hooks = new \Drupal\navigation\Hook\NavigationHooks();
$navigation_hooks->pluginFilterLayoutLayoutBuilderAlter($definitions, $extra);
}
},
deprecatedCallable: function() use (&$definitions, $extra) {
if (function_exists('navigation_plugin_filter_block__layout_builder_alter')) {
navigation_plugin_filter_block__layout_builder_alter($definitions, $extra);
}
},
);
// Add the definitions we consider safe again.
$definitions += $safe_definitions;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment