From 191473dde61710c1b36909f8e1475e79181b8e7a Mon Sep 17 00:00:00 2001 From: andris-sevcenko Date: Fri, 31 Aug 2018 16:10:44 +0300 Subject: [PATCH] Restore changes made by #3023 --- src/services/Sections.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/services/Sections.php b/src/services/Sections.php index 1d6c7943189..2c91f3f0c8f 100644 --- a/src/services/Sections.php +++ b/src/services/Sections.php @@ -888,14 +888,16 @@ public function handleDeletedSection(ParseConfigEvent $event) } // Delete the entries - $entries = Entry::find() + $entryQuery = Entry::find() ->status(null) ->enabledForSite(false) - ->sectionId($sectionRecord->id) - ->all(); + ->sectionId($sectionRecord->id); - foreach ($entries as $entry) { - Craft::$app->getElements()->deleteElement($entry); + $elementsService = Craft::$app->getElements(); + foreach (Craft::$app->getSites()->getAllSiteIds() as $siteId) { + foreach ($entryQuery->siteId($siteId)->each() as $entry) { + $elementsService->deleteElement($entry); + } } // Delete the structure, if there is one @@ -1369,14 +1371,17 @@ public function handleDeletedEntryType(ParseConfigEvent $event) } // Delete the entries - $entries = Entry::find() + $entryQuery = Entry::find() ->status(null) ->enabledForSite(false) - ->typeId($entryTypeRecord->id) - ->all(); + ->typeId($entryTypeRecord->id); - foreach ($entries as $entry) { - Craft::$app->getElements()->deleteElement($entry); + + $elementsService = Craft::$app->getElements(); + foreach (Craft::$app->getSites()->getAllSiteIds() as $siteId) { + foreach ($entryQuery->siteId($siteId)->each() as $entry) { + $elementsService->deleteElement($entry); + } } // Delete the entry type.