diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index afa4840..eeba9f9 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1659,7 +1659,7 @@ function theme_menu_link(array $variables) {
if ($element['#below']) {
$sub_menu = drupal_render($element['#below']);
}
- $output = l($element['#title'], $element['#href'], $element['#localized_options']);
+ $output = l($element['#title'], $element['#href'], $element['#localized_options']->getValue());
return '
' . $output . $sub_menu . "\n";
}
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 7346712..9ca3473 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -132,7 +132,7 @@ function _menu_overview_tree_form($tree, $delta = 50) {
$mlid = 'mlid:' . $item['mlid'];
$form[$mlid]['#item'] = $item;
$form[$mlid]['#attributes'] = $item['hidden'] ? array('class' => array('menu-disabled')) : array('class' => array('menu-enabled'));
- $form[$mlid]['title']['#markup'] = l($item['title'], $item['href'], $item['localized_options']);
+ $form[$mlid]['title']['#markup'] = l($item['title'], $item['href'], $item['localized_options']->getValue());
if ($item['hidden']) {
$form[$mlid]['title']['#markup'] .= ' (' . t('disabled') . ')';
}
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index a2118a3..edfe7b6 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -125,7 +125,7 @@ public function form(array $form, array &$form_state) {
$form['_path'] = array(
'#type' => 'item',
'#title' => t('Path'),
- '#description' => l($menu_link->link_title->value, $menu_link->href->value, $menu_link->options->value),
+ '#description' => l($menu_link->link_title->value, $menu_link->href, $menu_link->options->get('value')->getValue()),
);
}
@@ -252,23 +252,16 @@ public function validate(array $form, array &$form_state) {
parent::validate($form, $form_state);
}
- /**
- * Overrides EntityFormController::submit().
- */
- public function submit(array $form, array &$form_state) {
- // Build the menu link object from the submitted values.
- $menu_link = parent::submit($form, $form_state);
-
+ public function buildEntity(array $form, array &$form_state) {
+ $entity = parent::buildEntity($form, $form_state);
// The value of "hidden" is the opposite of the value supplied by the
// "enabled" checkbox.
- $menu_link->hidden->value = (int) !$menu_link->enabled->value;
- // @todo Check out this 'enabled' stuff.
-// unset($menu_link->enabled);
-
- $menu_link->options->value['attributes']['title'] = $menu_link->description->value;
- list($menu_link->menu_name->value, $menu_link->plid->target_id) = explode(':', $menu_link->parent);
-
- return $menu_link;
+ $entity->hidden->value = (int) !$form_state['values']['enabled'];
+ list($entity->menu_name->value, $entity->plid->target_id) = explode(':', $form_state['values']['parent']);
+ $attributes = $entity->options->value['attributes'];
+ $attributes['title'] = $form_state['values']['description'];
+ $entity->options->value['attributes'] = $attributes;
+ return $entity;
}
/**
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
index 245b9a4..ffbec71 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
@@ -435,9 +435,7 @@ public function offsetExists($offset) {
if (in_array($offset, $this->oldRoutingProperties)) {
return isset($this->oldRouterItem[$offset]);
}
-
return isset($this->{$offset}->value);
-// return isset($this->{$offset});
}
/**
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 4a7cdf4..1b3d9e8 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2459,7 +2459,7 @@ function system_admin_menu_block($item) {
$menu_links = entity_load_multiple_by_properties('menu_link', array('router_path' => $item['path'], 'module' => 'system'));
$menu_link = reset($menu_links);
$item['mlid'] = $menu_link->id();
- $item['menu_name'] = $menu_link->menu_name;
+ $item['menu_name'] = $menu_link->menu_name->value;
}
if (isset($cache[$item['mlid']])) {
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index f1cacc0..cc16645 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -970,13 +970,13 @@ function user_menu_link_presave(MenuLink $menu_link) {
// for authenticated users. Authenticated users should see "My account", but
// anonymous users should not see it at all. Therefore, invoke
// user_menu_link_load() to conditionally hide the link.
- if ($menu_link->link_path == 'user' && $menu_link->module == 'system') {
+ if ($menu_link->link_path->value == 'user' && $menu_link->module->value == 'system') {
$menu_link->options['alter'] = TRUE;
}
// Force the Logout link to appear on the top-level of 'account' menu by
// default (i.e., unless it has been customized).
- if ($menu_link->link_path == 'user/logout' && $menu_link->module == 'system' && empty($menu_link->customized)) {
+ if ($menu_link->link_path->value == 'user/logout' && $menu_link->module->value == 'system' && empty($menu_link->customized->value)) {
$menu_link->plid = 0;
}
}
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 3dc83ac..8369c63 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -98,7 +98,7 @@ function seven_admin_block_content($variables) {
foreach ($content as $item) {
$output .= '';
$content = '' . filter_xss_admin($item['title']) . '';
- $options = $item['localized_options'];
+ $options = $item['localized_options']->getValue();
$options['html'] = TRUE;
if (isset($item['description']) && !system_admin_compact_mode()) {
$content .= '' . filter_xss_admin($item['description']) . '
';