Merge branch 'hotfix/5.8.4'

This commit is contained in:
Yuri Kuznetsov
2020-03-12 17:05:36 +02:00

View File

@@ -2694,9 +2694,9 @@ class Base
}
}
if (!empty($params['orderBy'])) {
$sortByField = $params['orderBy'];
$sortByField = $params['orderBy'] ?? $this->getMetadata()->get(['entityDefs', $this->entityType, 'collection', 'orderBy']);
if ($sortByField) {
$sortByAttributeList = $this->getFieldManagerUtil()->getAttributeList($this->getEntityType(), $sortByField);
foreach ($sortByAttributeList as $attribute) {
if (!in_array($attribute, $attributeList) && $seed->hasAttribute($attribute)) {