de465d5 part 2

craftcms · May 22, 2018 · e6e16d9 · e6e16d9
1 parent de465d5
commit e6e16d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/elements/db/ElementQuery.php b/src/elements/db/ElementQuery.php
@@ -1569,7 +1569,7 @@ private function _applyRelatedToParam()
         }
 
         $parser = new ElementRelationParamParser([
-            'fields' => ArrayHelper::index($this->customFields, 'handle')
+            'fields' => $this->customFields ? ArrayHelper::index($this->customFields, 'handle') : []
         ]);
         $condition = $parser->parse($this->relatedTo);
 

diff --git a/src/elements/db/ElementRelationParamParser.php b/src/elements/db/ElementRelationParamParser.php
@@ -16,14 +16,15 @@
 use craft\fields\Matrix;
 use craft\helpers\StringHelper;
 use craft\models\Site;
+use yii\base\BaseObject;
 
 /**
  * Parses a relatedTo param on an ElementQuery.
  *
  * @author Pixel & Tonic, Inc. <[email protected]>
  * @since 3.0
  */
-class ElementRelationParamParser
+class ElementRelationParamParser extends BaseObject
 {
     // Constants
     // =========================================================================