From b517a12f8a491c838247ff9ce8b49185d6554bfb Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 28 Jan 2024 23:08:37 +0100 Subject: [PATCH] Avoid duplicate loading of hooks --- admin/tools/settings_save.php | 4 ---- system/src/Commands/Command.php | 5 ----- system/src/Commands/CronjobCommand.php | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/admin/tools/settings_save.php b/admin/tools/settings_save.php index 7ed43093..dffea976 100644 --- a/admin/tools/settings_save.php +++ b/admin/tools/settings_save.php @@ -10,10 +10,6 @@ require SYSTEM . 'functions.php'; require SYSTEM . 'init.php'; require SYSTEM . 'login.php'; -// event system -$hooks = new Hooks(); -$hooks->load(); - if(!admin()) { http_response_code(500); die('Access denied.'); diff --git a/system/src/Commands/Command.php b/system/src/Commands/Command.php index 7295acaa..76f3810e 100644 --- a/system/src/Commands/Command.php +++ b/system/src/Commands/Command.php @@ -7,12 +7,7 @@ use Symfony\Component\Console\Command\Command as SymfonyCommand; class Command extends SymfonyCommand { - protected Hooks $hooks; - public function __construct() { parent::__construct(); - - $this->hooks = new Hooks(); - $this->hooks->load(); } } diff --git a/system/src/Commands/CronjobCommand.php b/system/src/Commands/CronjobCommand.php index 81d3dd90..f314b73b 100644 --- a/system/src/Commands/CronjobCommand.php +++ b/system/src/Commands/CronjobCommand.php @@ -19,7 +19,8 @@ class CronjobCommand extends Command // Create a new scheduler $scheduler = new Scheduler(); - $this->hooks->trigger(HOOK_CRONJOB, ['scheduler' => $scheduler]); + global $hooks; + $hooks->trigger(HOOK_CRONJOB, ['scheduler' => $scheduler]); // Let the scheduler execute jobs which are due. $scheduler->run();