This commit is contained in:
Bellord
2026-07-08 13:28:49 +03:00
parent 01d61b89fe
commit c2b1e4c143
4 changed files with 2729 additions and 7 deletions
+4 -5
View File
@@ -7,7 +7,6 @@ class ElementList
public static function getGlobalFilter($iBlockId, $globalFilter)
{
$pFilter = [];
$af = app()->factory()->iBlock()->getEntityById($iBlockId);
$iBlockFactory = app()->factory()->main()->getIBlockFactory();
@@ -78,16 +77,16 @@ class ElementList
}
}
if($pFilter[$propertyId]['E'][$key] || $pFilter[$propertyId]['O'][$oKey]){
//if($pFilter[$propertyId]['E'][$key] || $pFilter[$propertyId]['O'][$oKey]){
if($globalFilter[$key]){
$pFilter[$propertyId]['E'][$key] = array_merge($pFilter[$propertyId]['E'][$key], $globalFilter[$key]);
$pFilter[$propertyId]['E'][$key] = array_merge((array)$pFilter[$propertyId]['E'][$key], $globalFilter[$key]);
unset($globalFilter[$key]);
}
if($globalFilter['OFFERS'][$oKey]){
$pFilter[$propertyId]['O'][$oKey] = array_merge($pFilter[$propertyId]['O'][$oKey], $globalFilter['OFFERS'][$oKey]);
$pFilter[$propertyId]['O'][$oKey] = array_merge((array)$pFilter[$propertyId]['O'][$oKey], $globalFilter['OFFERS'][$oKey]);
unset($globalFilter['OFFERS'][$oKey]);
}
}
//}
if(!$globalFilter[$key]){
unset($globalFilter[$key]);