From 78621a34878093fe2fed7bcf76ac61aca9acb249 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 11 Feb 2014 21:45:55 +0000 Subject: small optim on events trigger when several handlers are registered (no more array_slice inside the loop) git-svn-id: http://piwigo.org/svn/trunk@27335 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_plugins.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/functions_plugins.inc.php') diff --git a/include/functions_plugins.inc.php b/include/functions_plugins.inc.php index 273a5e0c4..4b9992395 100644 --- a/include/functions_plugins.inc.php +++ b/include/functions_plugins.inc.php @@ -279,19 +279,20 @@ function trigger_event($event, $data=null) return $data; } $args = func_get_args(); + array_shift($args); foreach ($pwg_event_handlers[$event] as $priority => $handlers) { foreach ($handlers as $handler) { - $args[1] = $data; + $args[0] = $data; if (!empty($handler['include_path'])) { include_once($handler['include_path']); } - $data = call_user_func_array($handler['function'], array_slice($args, 1)); + $data = call_user_func_array($handler['function'], $args); } } @@ -341,6 +342,7 @@ function trigger_action($event) return; } $args = func_get_args(); + array_shift($args); foreach ($pwg_event_handlers[$event] as $priority => $handlers) { @@ -351,7 +353,7 @@ function trigger_action($event) include_once($handler['include_path']); } - call_user_func_array($handler['function'], array_slice($args,1)); + call_user_func_array($handler['function'], $args); } } } -- cgit v1.2.3