Index: core/kernel/db/cat_event_handler.php =================================================================== --- core/kernel/db/cat_event_handler.php +++ core/kernel/db/cat_event_handler.php @@ -2640,24 +2640,18 @@ if ( $ids ) { foreach ($ids as $id) { - $ret = true; + $object->Clear(); $object->Load($id); switch ( $event->Name ) { case 'OnMassApprove': - $ret = $object->ApproveChanges(); + $object->ApproveChanges(); break; case 'OnMassDecline': - $ret = $object->DeclineChanges(); + $object->DeclineChanges(); break; } - - if ( !$ret ) { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } } Index: core/kernel/db/db_event_handler.php =================================================================== --- core/kernel/db/db_event_handler.php +++ core/kernel/db/db_event_handler.php @@ -2244,6 +2244,7 @@ } foreach ($ids as $id) { + $object->Clear(); $object->Load($id); switch ( $event->Name ) { @@ -2264,14 +2265,7 @@ break; } - if ( $object->Update() ) { - $event->status = kEvent::erSUCCESS; - } - else { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } + $object->Update(); } } Index: core/units/categories/categories_event_handler.php =================================================================== --- core/units/categories/categories_event_handler.php +++ core/units/categories/categories_event_handler.php @@ -1578,6 +1578,7 @@ $propagate_category_status = $this->Application->GetVar('propagate_category_status'); foreach ($ids as $id) { + $object->Clear(); $object->Load($id); $object->SetDBField($status_field, $event->Name == 'OnMassApprove' ? 1 : 0); @@ -1589,16 +1590,9 @@ $this->Conn->Query($sql); } - $event->status = kEvent::erSUCCESS; - $email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY'; $this->Application->emailUser($email_event, $object->GetDBField('CreatedById')); } - else { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } } Index: modules/in-commerce/units/affiliates/affiliates_event_handler.php =================================================================== --- modules/in-commerce/units/affiliates/affiliates_event_handler.php +++ modules/in-commerce/units/affiliates/affiliates_event_handler.php @@ -595,6 +595,7 @@ $status_field = $object->getStatusField(); foreach ($ids as $id) { + $object->Clear(); $object->Load($id); switch ($event->Name) { @@ -626,14 +627,9 @@ $this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED'); break; } - $event->status = kEvent::erSUCCESS; + $event->SetRedirectParam('opener', 's'); //stay! } - else { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } } } Index: modules/in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php =================================================================== --- modules/in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php +++ modules/in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php @@ -66,23 +66,6 @@ } /** - * Apply same processing to each item being selected in grid - * - * @param kEvent $event - * @return void - * @access protected - */ - protected function iterateItems(kEvent $event) - { - parent::iterateItems($event); - - if ( $event->Name == 'OnMassApprove' ) { - $event->status = kEvent::erSUCCESS; - $event->redirect = true; - } - } - - /** * Sets virtual fields from serialized properties array * * @param kEvent $event @@ -155,4 +138,4 @@ WHERE VarName LIKE "ShippingQuotes%"'; $this->Conn->Query($sql); } -} \ No newline at end of file +} Index: modules/in-link/units/link_validation/link_validation_eh.php =================================================================== --- modules/in-link/units/link_validation/link_validation_eh.php +++ modules/in-link/units/link_validation/link_validation_eh.php @@ -439,24 +439,18 @@ /* @var $object kCatDBItem */ foreach ($ids as $id) { - $ret = true; + $object->Clear(); $object->Load($id); switch ( $event->Name ) { case 'OnApproveLinks': - $ret = $object->ApproveChanges(); + $object->ApproveChanges(); break; case 'OnDeclineLinks': - $ret = $object->DeclineChanges(); + $object->DeclineChanges(); break; } - - if ( !$ret ) { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } } @@ -568,4 +562,4 @@ $this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields); } - } \ No newline at end of file + } Index: modules/in-link/units/listings/listings_event_handler.php =================================================================== --- modules/in-link/units/listings/listings_event_handler.php +++ modules/in-link/units/listings/listings_event_handler.php @@ -583,6 +583,7 @@ /* @var $lst_object kDBItem */ foreach ($ids as $id) { + $object->Clear(); $object->Load($id); $sql = 'SELECT CreatedById @@ -614,11 +615,6 @@ $this->Application->emailUser('LINK.ENHANCE.RENEW', $owner_id); $this->Application->emailAdmin('LINK.ENHANCE.RENEW'); } - else { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } else { $this->Application->emailUser('LINK.ENHANCE.APPROVE', $owner_id); @@ -843,4 +839,4 @@ $calculated_fields['']['LinkName'] = 'CONCAT(item_table.l' . $language_id . '_Name, " (", item_table.Url, ")")'; $this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields); } -} \ No newline at end of file +}