diff --git a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php b/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php index eb4b9fb..80c95bc 100644 --- a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php +++ b/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php @@ -33,6 +33,8 @@ class ForumBreadcrumbBuilder implements BreadcrumbBuilderInterface { /** * Constructs a new ForumBreadcrumbBuilder. * + * @param \Drupal\Core\Entity\EntityManager + * The entity manager. * @param \Drupal\Core\Config\ConfigFactory $configFactory * The configuration factory. */ diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index a256a7a..d3bd6b0 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -1666,8 +1666,8 @@ public function getBreadcrumb($set = FALSE) { } if ($set) { - if ($base && drupal_set_breadcrumb()) { - $breadcrumb = array_merge(drupal_set_breadcrumb(), $breadcrumb); + if ($base && $current_breadcrumbs = drupal_set_breadcrumb()) { + $breadcrumb = array_merge($current_breadcrumbs, $breadcrumb); } drupal_set_breadcrumb($breadcrumb); }