TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use fireCombinedEvent to handle fireSystemEvent." 

This reverts commit eb5b568b6f.
This commit is contained in:
Luke Towers 2018-05-17 02:16:19 -06:00
parent eb5b568b6f
commit 7d4912b80a
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/system/traits/EventEmitter.php
View File

@ -35,7 +35,37 @@ trait EventEmitter
*/
public function fireSystemEvent($event, $params = [], $halt = true)
{
return $this->fireCombinedEvent($event, $params, $halt, true);
$result = [];
$shortEvent = substr($event, strpos($event, '.') + 1);
$longArgs = array_merge([$this], $params);
/*
* Local event first
*/
if ($response = $this->fireEvent($shortEvent, $params, $halt)) {
if ($halt) {
return $response;
}
else {
$result = array_merge($result, $response);
}
}
/*
* Global event second
*/
if ($response = Event::fire($event, $longArgs, $halt)) {
if ($halt) {
return $response;
}
else {
$result = array_merge($result, $response);
}
}
return $result;
}
/**