diff --git a/core/includes/common.inc b/core/includes/common.inc index 914d1365277d67a19a51ef33224eacbf7f8b575f..c657cd5a070b8c4bb78eda145bb205cfa6318df9 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -285,28 +285,6 @@ function drupal_get_profile() { return $profile; } - -/** - * Sets the breadcrumb trail for the current page. - * - * @param $breadcrumb - * Array of links, starting with "home" and proceeding up to but not including - * the current page. - * - * @deprecated This will be removed in 8.0. Instead, register a new breadcrumb - * builder service. - * - * @see \Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface - */ -function drupal_set_breadcrumb($breadcrumb = NULL) { - $stored_breadcrumb = &drupal_static(__FUNCTION__); - - if (isset($breadcrumb)) { - $stored_breadcrumb = $breadcrumb; - } - return $stored_breadcrumb; -} - /** * Adds output to the HEAD tag of the HTML page. * diff --git a/core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php b/core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php deleted file mode 100644 index 3e5cc7137f96edd0a3abcfb721acddc07a891eb2..0000000000000000000000000000000000000000 --- a/core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php - -/** - * @file - * Contains \Drupal\system\LegacyBreadcrumbBuilder. - */ - -namespace Drupal\system; - -use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; - -/** - * Class to define the legacy breadcrumb builder. - * - * @deprecated This will be removed in 8.0. Instead, register a new breadcrumb - * builder service. - * - * @see \Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface - * - * This breadcrumb builder implements legacy support for the - * drupal_set_breadcrumb() mechanic. - * Remove this once drupal_set_breadcrumb() has been eliminated. - */ -class LegacyBreadcrumbBuilder implements BreadcrumbBuilderInterface { - - /** - * {@inheritdoc} - */ - public function build(array $attributes) { - $breadcrumb = drupal_set_breadcrumb(); - if (is_array($breadcrumb)) { - // $breadcrumb is expected to be an array of rendered breadcrumb links. - return $breadcrumb; - } - } - -} diff --git a/core/modules/system/system.services.yml b/core/modules/system/system.services.yml index 3371dad2c684f60932e6919f4474afd2689e77ca..935ddfd3e3f2d110ed67071b9c499db2db72c80b 100644 --- a/core/modules/system/system.services.yml +++ b/core/modules/system/system.services.yml @@ -6,10 +6,6 @@ services: system.manager: class: Drupal\system\SystemManager arguments: ['@module_handler', '@database', '@entity.manager'] - system.breadcrumb.legacy: - class: Drupal\system\LegacyBreadcrumbBuilder - tags: - - {name: breadcrumb_builder, priority: 500} system.breadcrumb.default: class: Drupal\system\PathBasedBreadcrumbBuilder arguments: ['@request', '@entity.manager', '@access_manager', '@router', '@path_processor_manager', '@config.factory', '@title_resolver']