diff -u b/core/core.services.yml b/core/core.services.yml --- b/core/core.services.yml +++ b/core/core.services.yml @@ -412,8 +412,6 @@ class: Drupal\system\Plugin\ImageToolkitInterface factory_method: getDefaultToolkit factory_service: image.toolkit.manager - breadcrumb: - class: Drupal\Core\Breadcrumb\BreadcrumbManager token: class: Drupal\Core\Utility\Token arguments: ['@module_handler'] @@ -423,6 +421,8 @@ class: Drupal\system\Plugin\ImageToolkitInterface factory_method: getDefaultToolkit factory_service: image.toolkit.manager + breadcrumb: + class: Drupal\Core\Breadcrumb\BreadcrumbManager token: class: Drupal\Core\Utility\Token arguments: ['@module_handler'] reverted: --- b/core/modules/system/lib/Drupal/system/Plugin/block/block/SystemBreadcrumbBlock.php +++ /dev/null @@ -1,45 +0,0 @@ -build($request->attributes); - if (!empty($breadcrumb)) { - // $breadcrumb is expected to be an array of rendered breadcrumb links. - return array( - '#theme' => 'breadcrumb', - '#breadcrumb' => $breadcrumb, - ); - } - } -} diff -u b/core/profiles/standard/config/block.block.bartik.breadcrumbs.yml b/core/profiles/standard/config/block.block.bartik.breadcrumbs.yml --- b/core/profiles/standard/config/block.block.bartik.breadcrumbs.yml +++ b/core/profiles/standard/config/block.block.bartik.breadcrumbs.yml @@ -2,17 +2,21 @@ -label: Breadcrumbs -label_display: '0' -region: content -weight: '' -module: system +weight: '-5' status: '1' +langcode: en +region: content +plugin: system_breadcrumb_block +settings: + label: Breadcrumbs + module: system + label_display: '0' + cache: '-1' visibility: path: visibility: '0' pages: '' role: roles: { } -plugin: system_breadcrumb_block -settings: - admin_label: Breadcrumbs - cache: '-1' -langcode: en + node_type: + types: + article: '0' + page: '0' + visibility__active_tab: edit-visibility-path diff -u b/core/profiles/standard/config/block.block.seven.breadcrumbs.yml b/core/profiles/standard/config/block.block.seven.breadcrumbs.yml --- b/core/profiles/standard/config/block.block.seven.breadcrumbs.yml +++ b/core/profiles/standard/config/block.block.seven.breadcrumbs.yml @@ -2,17 +2,21 @@ -label: Breadcrumbs -label_display: '0' -region: content -weight: '' -module: system +weight: '-2' status: '1' +langcode: en +region: content +plugin: system_breadcrumb_block +settings: + label: Breadcrumbs + module: system + label_display: '0' + cache: '-1' visibility: path: visibility: '0' pages: '' role: roles: { } -plugin: system_breadcrumb_block -settings: - admin_label: Breadcrumbs - cache: '-1' -langcode: en + node_type: + types: + article: '0' + page: '0' + visibility__active_tab: edit-visibility-path only in patch2: unchanged: --- /dev/null +++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php @@ -0,0 +1,44 @@ +build($request->attributes); + if (!empty($breadcrumb)) { + // $breadcrumb is expected to be an array of rendered breadcrumb links. + return array( + '#theme' => 'breadcrumb', + '#breadcrumb' => $breadcrumb, + ); + } + } +}