diff --git a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php b/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php index cf1d148..6128aa8 100644 --- a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php +++ b/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php @@ -59,22 +59,20 @@ public function __construct(EntityManagerInterface $entity_manager, ConfigFactor * {@inheritdoc} */ public function applies(array $attributes) { - return !empty($attributes[RouteObjectInterface::ROUTE_NAME]); + return !empty($attributes[RouteObjectInterface::ROUTE_NAME]) + && (($attributes[RouteObjectInterface::ROUTE_NAME] == 'node.view' && isset($attributes['node']) && $this->forumManager->checkNodeType($attributes['node'])) + || ($attributes[RouteObjectInterface::ROUTE_NAME] == 'forum.page' && isset($attributes['taxonomy_term'])) + ); } /** * {@inheritdoc} */ public function build(array $attributes) { - $route_name = $attributes[RouteObjectInterface::ROUTE_NAME]; - - if ($route_name == 'node.view' && isset($attributes['node'])) { - if ($this->forumManager->checkNodeType($attributes['node'])) { - return $this->forumPostBreadcrumb($attributes['node']); - } + if ($attributes[RouteObjectInterface::ROUTE_NAME] == 'node.view') { + return $this->forumPostBreadcrumb($attributes['node']); } - - if ($route_name == 'forum.page' && isset($attributes['taxonomy_term'])) { + elseif ($attributes[RouteObjectInterface::ROUTE_NAME] == 'forum.page') { return $this->forumTermBreadcrumb($attributes['taxonomy_term']); } }