Index: branches/5.0.x/in-commerce/units/products/products_event_handler.php =================================================================== diff -u -r12674 -r12722 --- branches/5.0.x/in-commerce/units/products/products_event_handler.php (.../products_event_handler.php) (revision 12674) +++ branches/5.0.x/in-commerce/units/products/products_event_handler.php (.../products_event_handler.php) (revision 12722) @@ -1,6 +1,6 @@ addFilter('not_virtual', '%1$s.Virtual = 0'); - if ( !$this->Application->IsAdmin() ) { + if (!$this->Application->isAdminUser) { $object->addFilter('expire_filter', '%1$s.Expire IS NULL OR %1$s.Expire > UNIX_TIMESTAMP()'); } @@ -1226,9 +1226,10 @@ return $passed; } - if ($this->Application->IsAdmin()) { + if ($this->Application->isAdminUser) { // we may get product id out of OrderItem, if it exists $ord_item =& $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0)); + if ($ord_item->GetDBField('ProductId')) { $passed = $ord_item->GetDBField('ProductId'); }