summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimKruijsen2018-02-08 10:30:31 (GMT)
committertimKruijsen2018-02-08 10:31:02 (GMT)
commit2ad0511fee40d119b67fa4c292f884a90ca9d04e (patch)
tree22cd3244e31ac886c330e17ea638021cf27a170b
parentda8ab8f299cecc125fec98b868ec432aa84fd8bd (diff)
Revert "git commit -m 'Issue #2943053 by awolfey: Patch for link attributes Full import' --author="awolfey <awolfey@277371.no-reply.drupal.org>""
This reverts commit da8ab8f299cecc125fec98b868ec432aa84fd8bd.
-rwxr-xr-xsrc/Controller/MenuLinksController.php27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/Controller/MenuLinksController.php b/src/Controller/MenuLinksController.php
index feb9a6c..61f9e67 100755
--- a/src/Controller/MenuLinksController.php
+++ b/src/Controller/MenuLinksController.php
@@ -223,13 +223,13 @@ class MenuLinksController extends ControllerBase {
}
if(!empty($uuidsInConfig)) {
- $query = StructureSyncHelper::getEntityQuery('menu_link_content');
- $query->condition('uuid', $uuidsInConfig, 'NOT IN');
- $ids = $query->execute();
- $controller = StructureSyncHelper::getEntityManager()
- ->getStorage('menu_link_content');
- $entities = $controller->loadMultiple($ids);
- $controller->delete($entities);
+ $query = StructureSyncHelper::getEntityQuery('menu_link_content');
+ $query->condition('uuid', $uuidsInConfig, 'NOT IN');
+ $ids = $query->execute();
+ $controller = StructureSyncHelper::getEntityManager()
+ ->getStorage('menu_link_content');
+ $entities = $controller->loadMultiple($ids);
+ $controller->delete($entities);
}
if (array_key_exists('drush', $context) && $context['drush'] === TRUE) {
@@ -251,12 +251,12 @@ class MenuLinksController extends ControllerBase {
}
$entities = [];
if(!empty($uuidsInConfig)) {
- $query = StructureSyncHelper::getEntityQuery('menu_link_content');
- $query->condition('uuid', $uuidsInConfig, 'IN');
- $ids = $query->execute();
- $controller = StructureSyncHelper::getEntityManager()
- ->getStorage('menu_link_content');
- $entities = $controller->loadMultiple($ids);
+ $query = StructureSyncHelper::getEntityQuery('menu_link_content');
+ $query->condition('uuid', $uuidsInConfig, 'IN');
+ $ids = $query->execute();
+ $controller = StructureSyncHelper::getEntityManager()
+ ->getStorage('menu_link_content');
+ $entities = $controller->loadMultiple($ids);
}
$parents = array_column($menus, 'parent');
@@ -322,7 +322,6 @@ class MenuLinksController extends ControllerBase {
->set('link', [
'uri' => $menuLink['uri'],
'title' => $menuLink['link_title'],
- 'options' => !empty($menuLink['attributes']) ? ['attributes' => $menuLink['attributes']] : NULL,
])
->set('expanded', $menuLink['expanded'] === '1' ? TRUE : FALSE)
->set('enabled', $menuLink['enabled'] === '1' ? TRUE : FALSE)