From ab6e698fc4cf3d6bb3d6115f4d38ec0718aa4db2 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Tue, 19 Nov 2013 14:10:49 +0100 Subject: [PATCH] Fixed missing raiseAction in server.php Fixed output of action name in debug mode (registerAction) --- server/lib/classes/plugins.inc.php | 2 +- server/server.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php index 4808a563d0..4771487dce 100644 --- a/server/lib/classes/plugins.inc.php +++ b/server/lib/classes/plugins.inc.php @@ -134,7 +134,7 @@ class plugins { function registerAction($action_name, $plugin_name, $function_name) { global $app; $this->subscribed_actions[$action_name][] = array('plugin' => $plugin_name, 'function' => $function_name); - if($this->debug) $app->log("Registered function '$function_name' from plugin '$plugin_name' for action '$event_name'.", LOGLEVEL_DEBUG); + if($this->debug) $app->log("Registered function '$function_name' from plugin '$plugin_name' for action '$action_name'.", LOGLEVEL_DEBUG); } diff --git a/server/server.php b/server/server.php index e4ebb5b19f..ab25404424 100644 --- a/server/server.php +++ b/server/server.php @@ -172,6 +172,9 @@ if ($app->db->connect_error == NULL && $app->dbmaster->connect_error == NULL) { $app->modules->loadModules('all'); //** Load the plugins that are in the plugins-enabled folder $app->plugins->loadPlugins('all'); + + $app->plugins->raiseAction('server_plugins_loaded', ''); + if ($tmp_num_records > 0) { $app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG); //** Go through the sys_datalog table and call the processing functions -- GitLab