From 163b173805ea18f8cd2f3194b1c61ece7deb9981 Mon Sep 17 00:00:00 2001 From: Ian Nebbiolo Date: Tue, 28 Jul 2020 16:33:18 +0100 Subject: [PATCH] Added a fix for deleted sites This fixes an issue (#25) where deleted sites would be included in sitemap generation, causing an error to be thrown. --- src/controllers/SitemapController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/SitemapController.php b/src/controllers/SitemapController.php index 4a2ff2b..27cd72f 100644 --- a/src/controllers/SitemapController.php +++ b/src/controllers/SitemapController.php @@ -172,10 +172,9 @@ private function _createEntrySectionQuery(): Query '[[elements_sites.elementId]] = [[elements.id]] AND [[elements_sites.enabled]] = 1') ->innerJoin('{{%sites}} sites', '[[elements_sites.siteId]] = [[sites.id]]') ->andWhere(['elements.dateDeleted' => null]) + ->andWhere(['sites.dateDeleted' => null]) ->andWhere(['elements.archived' => false]) ->andWhere(['elements.revisionId' => null]) - - ->groupBy(['elements_sites.id']); } @@ -206,6 +205,7 @@ private function _createAlternateSectionQuery($elementId): Query '[[elements_sites.elementId]] = [[elements.id]] AND [[elements_sites.enabled]] = 1') ->innerJoin('{{%sites}} sites', '[[elements_sites.siteId]] = [[sites.id]]') ->where(['=', '[[elements_sites.elementId]]', $elementId]) + ->andWhere(['sites.dateDeleted' => null]) ->groupBy(['elements_sites.id']); } @@ -230,6 +230,7 @@ private function _createEntryCategoryQuery(): Query '[[elements_sites.elementId]] = [[elements.id]] AND [[elements_sites.enabled]] = 1') ->innerJoin('{{%sites}} sites', '[[elements_sites.siteId]] = [[sites.id]]') ->andWhere(['elements.dateDeleted' => null]) + ->andWhere(['sites.dateDeleted' => null]) ->groupBy(['elements_sites.id']); }