Don't join in structure elements that belong to soft-deleted structures

Fixes #4066
craftcms · Mar 28, 2019 · bcda737 · bcda737
1 parent e744f2b
commit bcda737
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -9,6 +9,7 @@
 ### Fixed
 - Fixed a bug where the Asset Indexes utility wasn’t logging exceptions.
 - Fixed a SQL error that could occur when using the Asset Indexes utility, if any filenames contained 4+ byte characters.
+- Fixed a bug where entry queries could return duplicate results for any entries that belong to a section that has soft-deleted structures associated with it. ([#4066](https://github.com/craftcms/cms/issues/4066))
 
 ## 3.1.20.1 - 2019-03-27
 

diff --git a/src/elements/db/ElementQuery.php b/src/elements/db/ElementQuery.php
@@ -1785,9 +1785,24 @@ private function _applyStructureParams(string $class)
         } else {
             $this->query
                 ->addSelect(['structureelements.structureId'])
-                ->leftJoin('{{%structureelements}} structureelements', '[[structureelements.elementId]] = [[subquery.elementsId]]');
+                ->leftJoin('{{%structureelements}} structureelements', [
+                    'and',
+                    '[[structureelements.elementId]] = [[subquery.elementsId]]',
+                    '[[structureelements.structureId]] = [[subquery.structureId]]',
+                ]);
             $this->subQuery
-                ->leftJoin('{{%structureelements}} structureelements', '[[structureelements.elementId]] = [[elements.id]]');
+                ->addSelect(['structureelements.structureId'])
+                ->leftJoin('{{%structureelements}} structureelements', [
+                    'and',
+                    '[[structureelements.elementId]] = [[elements.id]]',
+                    [
+                        'exists',
+                        (new Query())
+                            ->from([Table::STRUCTURES])
+                            ->where('[[id]] = [[structureelements.structureId]]')
+                            ->andWhere(['dateDeleted' => null])
+                    ],
+                ]);
         }
 
         if ($this->hasDescendants !== null) {