diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 67c1316..731d185 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -643,7 +643,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { // including unserializing all existing link options and running this code // on them, as well as adding validation to menu_link_save(). if (isset($item['options']['attributes']['class']) && is_string($item['options']['attributes']['class'])) { - if ($link_translate) { + if ($item instanceof MenuLink) { $item->localized_options->attributes['class'] = explode(' ', $item->options->attributes['class']); } else { @@ -676,9 +676,10 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { } // Avoid calling check_plain again on l() function. if ($title_callback == 'check_plain') { - if ($link_translate) { + if ($item instanceof MenuLink) { $item->localized_options->html = TRUE; - } else { + } + else { $item['localized_options']['html'] = TRUE; } } diff --git a/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php b/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php index 2fef927..93d9e8e 100644 --- a/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php +++ b/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php @@ -85,8 +85,8 @@ public function build(array $attributes) { $depth = 1; while (!empty($book['p' . ($depth + 1)])) { if (!empty($menu_links[$book['p' . $depth]]) && ($menu_link = $menu_links[$book['p' . $depth]])) { - if ($this->accessManager->checkNamedRoute($menu_link->route_name, $menu_link->route_parameters)) { - $links[] = $this->linkGenerator->generate($menu_link->label(), $menu_link->route_name, $menu_link->route_parameters, $menu_link->options); + if ($this->accessManager->checkNamedRoute($menu_link->route_name->value, $menu_link->route_parameters[0]->getValue())) { + $links[] = $this->linkGenerator->generate($menu_link->label(), $menu_link->route_name->value, $menu_link->route_parameters[0]->getValue(), $menu_link->options[0]->getValue()); } } $depth++; diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module index 7e0358e..b7b4449 100644 --- a/core/modules/menu_link/menu_link.module +++ b/core/modules/menu_link/menu_link.module @@ -208,7 +208,7 @@ function menu_link_system_breadcrumb_alter(array &$breadcrumb, array $attributes $menu_link = $attributes['menu_link']; if (($menu_link instanceof MenuLinkInterface) && !$menu_link->isNew()) { // Add a link to the menu admin screen. - $menu = entity_load('menu', $menu_link->menu_name); + $menu = entity_load('menu', $menu_link->menu_name->value); $breadcrumb[] = Drupal::l($menu->label(), 'menu.menu_edit', array('menu' => $menu->id)); } }