From cfdbf02e6b4901850287d096b97fb38dbf5779d9 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 20 Nov 2023 21:52:40 +0000 Subject: the additional parameter has been deprecated there is no need to check the version anymore --- include/plugin.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'include/plugin.php') diff --git a/include/plugin.php b/include/plugin.php index 1a253d38f..eb761dc37 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -482,9 +482,13 @@ function call_hooks($name, &$data = null) { } $data = $checkhook['data']; } + $origfn = $hook[1]; - if($hook[0]) + + if($hook[0]) { @include_once($hook[0]); + } + if(preg_match('|^a:[0-9]+:{.*}$|s', $hook[1])) { $hook[1] = unserialize($hook[1]); } @@ -496,13 +500,12 @@ function call_hooks($name, &$data = null) { $hook[1] = explode('::',$hook[1]); } + if(is_callable($hook[1])) { $func = $hook[1]; - if($hook[3]) - $func($data); + $func($data); } else { - // Don't do any DB write calls if we're currently logging a possibly failed DB call. if(! DBA::$logging) { // The hook should be removed so we don't process it. -- cgit v1.2.3 From 33cb429e151766ec6cee7d050def380c487d88e0 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 20 Nov 2023 21:56:31 +0000 Subject: remove unused variable --- include/plugin.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/plugin.php') diff --git a/include/plugin.php b/include/plugin.php index eb761dc37..f1d501001 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -459,8 +459,6 @@ function insert_hook($hook, $fn, $version = 0, $priority = 0) { * @param[in,out] string|array &$data to transmit to the callback handler */ function call_hooks($name, &$data = null) { - $a = 0; - if (isset(App::$hooks[$name])) { foreach(App::$hooks[$name] as $hook) { -- cgit v1.2.3