From 07bf1285436a1add5e586682b87b6fb1233da3c2 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 19 Nov 2013 08:18:13 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
server/server.php | 3 +++
server/lib/classes/plugins.inc.php | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 4808a56..4771487 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -134,7 +134,7 @@
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 e4ebb5b..ab25404 100644
--- a/server/server.php
+++ b/server/server.php
@@ -172,6 +172,9 @@
$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
--
Gitblit v1.9.1