Fixed #14373

craftcms · Jun 4, 2024 · c5f81cc · c5f81cc
1 parent a50dcec
commit c5f81cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where the `db/backup` command could fail on Windows. ([#15090](https://github.com/craftcms/cms/issues/15090))
+- Fixed an error that could occur when applying project config changes if a site was deleted. ([#14373](https://github.com/craftcms/cms/issues/14373))
 
 ## 4.9.6 - 2024-06-03
 

diff --git a/src/services/Sections.php b/src/services/Sections.php
@@ -1462,7 +1462,11 @@ private function _createSectionSiteSettingsQuery(): Query
                 'sections_sites.template',
             ])
             ->from(['sections_sites' => Table::SECTIONS_SITES])
-            ->innerJoin(['sites' => Table::SITES], '[[sites.id]] = [[sections_sites.siteId]]')
+            ->innerJoin(['sites' => Table::SITES], [
+                'and',
+                '[[sites.id]] = [[sections_sites.siteId]]',
+                ['sites.dateDeleted' => null],
+            ])
             ->orderBy(['sites.sortOrder' => SORT_ASC]);
     }