Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
07bf1285
Commit
07bf1285
authored
Nov 19, 2013
by
Till Brehm
Browse files
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
parents
dce3bb51
ab6e698f
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/lib/classes/plugins.inc.php
View file @
07bf1285
...
...
@@ -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
);
}
...
...
server/server.php
View file @
07bf1285
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment