Added a fix for deleted sites

This fixes an issue (Dolphiq#25) where deleted sites would be included in sitemap generation, causing an error to be thrown.
mrnebbi · Jul 28, 2020 · 163b173 · 163b173
1 parent 5c062c6
commit 163b173
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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']);
     }