diff --git a/AvocadoEdition_Light/classes/event.php b/AvocadoEdition_Light/classes/event.php index 69a0cf2..9e835d3 100644 --- a/AvocadoEdition_Light/classes/event.php +++ b/AvocadoEdition_Light/classes/event.php @@ -13,6 +13,6 @@ class Event public function getAction(...$data) { - return call_user_func($this->action, $data); + return call_user_func_array($this->action, $data); } } diff --git a/AvocadoEdition_Light/classes/event_handler.php b/AvocadoEdition_Light/classes/event_handler.php index 55139d2..daba15c 100644 --- a/AvocadoEdition_Light/classes/event_handler.php +++ b/AvocadoEdition_Light/classes/event_handler.php @@ -211,7 +211,7 @@ class EventHandler /** * Adding Custom Functions at the declared time * @param string $event : event list 참조 - * @param Event $callback + * @param callback $callback * @param int $priority : optional * @return void */ @@ -227,7 +227,7 @@ class EventHandler { if (isset(self::$eventHandlers[$event])) { foreach (self::$eventHandlers[$event] as $callback) { - $callback->getAction($data); + $callback->getAction(...$data); } if (function_exists("run_event")) { diff --git a/AvocadoEdition_Light/common.php b/AvocadoEdition_Light/common.php index 422fe32..69737c4 100644 --- a/AvocadoEdition_Light/common.php +++ b/AvocadoEdition_Light/common.php @@ -393,6 +393,8 @@ if (file_exists($dbconfig_file)) { sql_query("SET SESSION sql_mode = ''"); if (defined('G5_TIMEZONE')) sql_query(" set time_zone = '" . G5_TIMEZONE . "'"); + + EventHandler::triggerEvent("amber.load_config_after"); } else { ?>