Merge branch 'ticket-10444' into develop
This commit is contained in:
commit
d2065341b2
@ -303,8 +303,15 @@ class MakeStats {
|
|||||||
if((int)$value['product_attribute_id']!=0
|
if((int)$value['product_attribute_id']!=0
|
||||||
&& $key = array_search($value['product_attribute_id'], array_column($res, 'product_attribute_id'))
|
&& $key = array_search($value['product_attribute_id'], array_column($res, 'product_attribute_id'))
|
||||||
&& $key
|
&& $key
|
||||||
|
&& $key['product_id'] == $value['product_id']
|
||||||
) {
|
) {
|
||||||
unset($res2[$k]);
|
unset($res2[$k]);
|
||||||
|
} elseif ((int)$value['product_attribute_id']==0
|
||||||
|
&& $key = array_search($value['product_id'], array_column($res, 'product_id'))
|
||||||
|
&& $key
|
||||||
|
&& (int)$key['product_attribute_id'] == 0
|
||||||
|
){
|
||||||
|
unset($res2[$k]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user