fix
This commit is contained in:
+2
-2
@@ -3,7 +3,7 @@
|
|||||||
"prefix": "ixrs_catalog",
|
"prefix": "ixrs_catalog",
|
||||||
"namespace": "Ixrs\\Catalog",
|
"namespace": "Ixrs\\Catalog",
|
||||||
"gitUrl": "https://bitbucket.org/bellord13/ixrs.catalog/",
|
"gitUrl": "https://bitbucket.org/bellord13/ixrs.catalog/",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"date": "2026-07-07 00:00:00",
|
"date": "2026-07-08 00:00:00",
|
||||||
"deps": ["wt.core"]
|
"deps": ["wt.core"]
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,6 @@ class ElementList
|
|||||||
|
|
||||||
public static function getGlobalFilter($iBlockId, $globalFilter)
|
public static function getGlobalFilter($iBlockId, $globalFilter)
|
||||||
{
|
{
|
||||||
|
|
||||||
$pFilter = [];
|
$pFilter = [];
|
||||||
$af = app()->factory()->iBlock()->getEntityById($iBlockId);
|
$af = app()->factory()->iBlock()->getEntityById($iBlockId);
|
||||||
$iBlockFactory = app()->factory()->main()->getIBlockFactory();
|
$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]){
|
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]);
|
unset($globalFilter[$key]);
|
||||||
}
|
}
|
||||||
if($globalFilter['OFFERS'][$oKey]){
|
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]);
|
unset($globalFilter['OFFERS'][$oKey]);
|
||||||
}
|
}
|
||||||
}
|
//}
|
||||||
|
|
||||||
if(!$globalFilter[$key]){
|
if(!$globalFilter[$key]){
|
||||||
unset($globalFilter[$key]);
|
unset($globalFilter[$key]);
|
||||||
|
|||||||
Reference in New Issue
Block a user