Skip to content

Commit 338bef3

Browse files
rdeutzrichard67
andauthored
[5.4] Change the table event name from onBeforeDelete to on TableBeforeDelete (joomla#46020)
--------- Co-authored-by: Richard Fath <[email protected]>
1 parent b143bf8 commit 338bef3

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

libraries/src/Table/Nested.php

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,13 +521,24 @@ public function delete($pk = null, $children = true)
521521
$pk = (\is_null($pk)) ? $this->$k : $pk;
522522

523523
// Pre-processing by observers
524-
$event = new Event(
524+
525+
// @deprecated 5.3 will be removed with 7.0 without replacement
526+
$oldEvent = new Event(
525527
'onBeforeDelete',
526528
[
527529
'pk' => $pk,
528530
]
529531
);
530-
$this->getDispatcher()->dispatch('onBeforeDelete', $event);
532+
$this->getDispatcher()->dispatch('onBeforeDelete', $oldEvent);
533+
534+
$event = AbstractEvent::create(
535+
'onTableBeforeDelete',
536+
[
537+
'subject' => $this,
538+
'pk' => $pk,
539+
]
540+
);
541+
$this->getDispatcher()->dispatch('onTableBeforeDelete', $event);
531542

532543
// If tracking assets, remove the asset first.
533544
$db = $this->getDatabase();
@@ -632,13 +643,24 @@ public function delete($pk = null, $children = true)
632643
$this->_unlock();
633644

634645
// Post-processing by observers
635-
$event = new Event(
646+
647+
// @deprecated 5.3 will be removed with 7.0 without replacement
648+
$oldEvent = new Event(
636649
'onAfterDelete',
637650
[
638651
'pk' => $pk,
639652
]
640653
);
641-
$this->getDispatcher()->dispatch('onAfterDelete', $event);
654+
$this->getDispatcher()->dispatch('onAfterDelete', $oldEvent);
655+
656+
$event = AbstractEvent::create(
657+
'onTableAfterDelete',
658+
[
659+
'subject' => $this,
660+
'pk' => $pk,
661+
]
662+
);
663+
$this->getDispatcher()->dispatch('onTableAfterDelete', $event);
642664

643665
return true;
644666
}

0 commit comments

Comments
 (0)