From eb5b568b6f4e29e0920c2fe107e8d7ba045fec1d Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Thu, 17 May 2018 01:44:41 -0600
Subject: [PATCH] Use fireCombinedEvent to handle fireSystemEvent.

Refs: https://github.com/octobercms/library/commit/d0cdf0ae6e7a5b8c68a312724e108b30efc34c7d
---
 modules/system/traits/EventEmitter.php | 32 +-------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/modules/system/traits/EventEmitter.php b/modules/system/traits/EventEmitter.php
index 054668b4c..f8e457c1a 100644
--- a/modules/system/traits/EventEmitter.php
+++ b/modules/system/traits/EventEmitter.php
@@ -35,37 +35,7 @@ trait EventEmitter
      */
     public function fireSystemEvent($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;
+        return $this->fireCombinedEvent($event, $params, $halt, true);
     }
 
     /**