From e035a448037660d1140ed9ecdc9f24cf7fa560b3 Mon Sep 17 00:00:00 2001
From: git <git@3517170.no-reply.drupal.org>
Date: Tue, 10 Apr 2018 16:14:33 +0200
Subject: [PATCH] Issue #2959845 by daniel.delaiglesia: Support for icons in
menu items
---
src/Controller/MenuLinksController.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Controller/MenuLinksController.php b/src/Controller/MenuLinksController.php
index feb9a6c..1c474de 100755
--- a/src/Controller/MenuLinksController.php
+++ b/src/Controller/MenuLinksController.php
@@ -72,7 +72,7 @@ public function exportMenuLinks(array $form = NULL, FormStateInterface $form_sta
'weight' => $menuLink->weight->getValue()[0]['value'],
'langcode' => $menuLink->langcode->getValue()[0]['value'],
'uuid' => $menuLink->uuid(),
- 'attributes' => !empty($menuLink->link->getValue()[0]['options']['attributes']) ? $menuLink->link->getValue()[0]['options']['attributes'] : NULL,
+ 'options' => !empty($menuLink->link->getValue()[0]['options']) ? $menuLink->link->getValue()[0]['options'] : NULL,
];
if (array_key_exists('drush', $form) && $form['drush'] === TRUE) {
@@ -300,7 +300,7 @@ public static function importMenuLinksFull($menus, &$context) {
'link' => [
'uri' => $menuLink['uri'],
'title' => $menuLink['link_title'],
- 'options' => !empty($menuLink['attributes']) ? ['attributes' => $menuLink['attributes']] : NULL,
+ 'options' => !empty($menuLink['options']) ? $menuLink['options'] : NULL,
],
'menu_name' => $menuLink['menu_name'],
'expanded' => $menuLink['expanded'] === '1' ? TRUE : FALSE,
@@ -322,7 +322,7 @@ public static function importMenuLinksFull($menus, &$context) {
->set('link', [
'uri' => $menuLink['uri'],
'title' => $menuLink['link_title'],
- 'options' => !empty($menuLink['attributes']) ? ['attributes' => $menuLink['attributes']] : NULL,
+ 'options' => !empty($menuLink['options']) ? $menuLink['options'] : NULL,
])
->set('expanded', $menuLink['expanded'] === '1' ? TRUE : FALSE)
->set('enabled', $menuLink['enabled'] === '1' ? TRUE : FALSE)
@@ -388,7 +388,7 @@ public static function importMenuLinksSafe($menus, &$context) {
'link' => [
'uri' => $menuLink['uri'],
'title' => $menuLink['link_title'],
- 'options' => !empty($menuLink['attributes']) ? ['attributes' => $menuLink['attributes']] : NULL,
+ 'options' => !empty($menuLink['options']) ? $menuLink['options'] : NULL,
],
'menu_name' => $menuLink['menu_name'],
'expanded' => $menuLink['expanded'] === '1' ? TRUE : FALSE,
@@ -434,7 +434,7 @@ public static function importMenuLinksForce($menus, &$context) {
'link' => [
'uri' => $menuLink['uri'],
'title' => $menuLink['link_title'],
- 'options' => !empty($menuLink['attributes']) ? ['attributes' => $menuLink['attributes']] : NULL,
+ 'options' => !empty($menuLink['options']) ? $menuLink['options'] : NULL,
],
'menu_name' => $menuLink['menu_name'],
'expanded' => $menuLink['expanded'] === '1' ? TRUE : FALSE,
--
GitLab