diff options
author | fidodido06 | 2018-01-31 13:06:27 (GMT) |
---|---|---|
committer | Fido van den Bos | 2018-01-31 13:06:27 (GMT) |
commit | d037ac0ae0ea1603c68e4df1d82f6b3c545593ba (patch) | |
tree | ea59a062979fdd2380aa1523e55a428ed71cc543 | |
parent | ada82b51e459c1a9fbcdf9cb620c7112c7f1b5f0 (diff) |
Issue #2933837 by fidodido06: borks on import8.x-1.7
-rw-r--r-- | src/Controller/BlocksController.php | 31 | ||||
-rwxr-xr-x | src/Controller/MenuLinksController.php | 16 | ||||
-rwxr-xr-x | src/Controller/TaxonomiesController.php | 32 |
3 files changed, 45 insertions, 34 deletions
diff --git a/src/Controller/BlocksController.php b/src/Controller/BlocksController.php index ab66c49..7d527f5 100644 --- a/src/Controller/BlocksController.php +++ b/src/Controller/BlocksController.php @@ -232,13 +232,15 @@ class BlocksController extends ControllerBase { $uuidsInConfig[] = $block['uuid']; } - $query = StructureSyncHelper::getEntityQuery('block_content'); - $query->condition('uuid', $uuidsInConfig, 'NOT IN'); - $ids = $query->execute(); - $controller = StructureSyncHelper::getEntityManager() - ->getStorage('block_content'); - $entities = $controller->loadMultiple($ids); - $controller->delete($entities); + if(!empty($uuidsInConfig)) { + $query = StructureSyncHelper::getEntityQuery('block_content'); + $query->condition('uuid', $uuidsInConfig, 'NOT IN'); + $ids = $query->execute(); + $controller = StructureSyncHelper::getEntityManager() + ->getStorage('block_content'); + $entities = $controller->loadMultiple($ids); + $controller->delete($entities); + } if (array_key_exists('drush', $context) && $context['drush'] === TRUE) { drush_log('Deleted custom blocks that were not in config', 'ok'); @@ -258,12 +260,15 @@ class BlocksController extends ControllerBase { $uuidsInConfig[] = $block['uuid']; } - $query = StructureSyncHelper::getEntityQuery('block_content'); - $query->condition('uuid', $uuidsInConfig, 'IN'); - $ids = $query->execute(); - $controller = StructureSyncHelper::getEntityManager() - ->getStorage('block_content'); - $entities = $controller->loadMultiple($ids); + $entities = []; + if(!empty($uuidsInConfig)) { + $query = StructureSyncHelper::getEntityQuery('block_content'); + $query->condition('uuid', $uuidsInConfig, 'IN'); + $ids = $query->execute(); + $controller = StructureSyncHelper::getEntityManager() + ->getStorage('block_content'); + $entities = $controller->loadMultiple($ids); + } $context['sandbox']['max'] = count($blocks); $context['sandbox']['progress'] = 0; diff --git a/src/Controller/MenuLinksController.php b/src/Controller/MenuLinksController.php index 3319063..b4ba173 100755 --- a/src/Controller/MenuLinksController.php +++ b/src/Controller/MenuLinksController.php @@ -248,13 +248,15 @@ class MenuLinksController extends ControllerBase { foreach ($menus as $menuLink) { $uuidsInConfig[] = $menuLink['uuid']; } - - $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); + $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); + } $parents = array_column($menus, 'parent'); foreach ($parents as &$parent) { diff --git a/src/Controller/TaxonomiesController.php b/src/Controller/TaxonomiesController.php index 4292b7c..1831025 100755 --- a/src/Controller/TaxonomiesController.php +++ b/src/Controller/TaxonomiesController.php @@ -246,13 +246,15 @@ class TaxonomiesController extends ControllerBase { } } - $query = StructureSyncHelper::getEntityQuery('taxonomy_term'); - $query->condition('uuid', $uuidsInConfig, 'NOT IN'); - $tids = $query->execute(); - $controller = StructureSyncHelper::getEntityManager() - ->getStorage('taxonomy_term'); - $entities = $controller->loadMultiple($tids); - $controller->delete($entities); + if(!empty($uuidsInConfig)) { + $query = StructureSyncHelper::getEntityQuery('taxonomy_term'); + $query->condition('uuid', $uuidsInConfig, 'NOT IN'); + $tids = $query->execute(); + $controller = StructureSyncHelper::getEntityManager() + ->getStorage('taxonomy_term'); + $entities = $controller->loadMultiple($tids); + $controller->delete($entities); + } if (array_key_exists('drush', $context) && $context['drush'] === TRUE) { drush_log('Deleted taxonomies that were not in config', 'ok'); @@ -273,13 +275,15 @@ class TaxonomiesController extends ControllerBase { $uuidsInConfig[] = $taxonomy['uuid']; } } - - $query = StructureSyncHelper::getEntityQuery('taxonomy_term'); - $query->condition('uuid', $uuidsInConfig, 'IN'); - $tids = $query->execute(); - $controller = StructureSyncHelper::getEntityManager() - ->getStorage('taxonomy_term'); - $entities = $controller->loadMultiple($tids); + $entities = []; + if(!empty($uuidsInConfig)) { + $query = StructureSyncHelper::getEntityQuery('taxonomy_term'); + $query->condition('uuid', $uuidsInConfig, 'IN'); + $tids = $query->execute(); + $controller = StructureSyncHelper::getEntityManager() + ->getStorage('taxonomy_term'); + $entities = $controller->loadMultiple($tids); + } $tidsDone = []; $tidsLeft = []; |