Page MenuHomeIn-Portal Phabricator
Files F1203572

D160.diff
No OneTemporary
Actions

File Metadata

Created
Mon, Nov 3, 3:31 PM

D160.diff
View Options

Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
--- branches/5.2.x/core/kernel/db/cat_event_handler.php
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php
@@ -2652,24 +2652,17 @@
if ( $ids ) {
foreach ($ids as $id) {
- $ret = true;
$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: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
--- branches/5.2.x/core/kernel/db/db_event_handler.php
+++ branches/5.2.x/core/kernel/db/db_event_handler.php
@@ -2278,14 +2278,7 @@
break;
}
- if ( $object->Update() ) {
- $event->status = kEvent::erSUCCESS;
- }
- else {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
+ $object->Update();
}
}
Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
--- branches/5.2.x/core/units/categories/categories_event_handler.php
+++ branches/5.2.x/core/units/categories/categories_event_handler.php
@@ -1594,16 +1594,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;
- }
}
}

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server