diff options
| author | mistic100 <mistic@piwigo.org> | 2013-06-19 15:21:12 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2013-06-19 15:21:12 +0000 |
| commit | 6119b6895ecc88cc8e368d7776e39b4a56d75511 (patch) | |
| tree | 705fbdb3afe86c9683e57c85a0ecccd68258c838 | |
| parent | 23329cc2ff9883e22389587d0eeadd8c80f297dd (diff) | |
Add trigger "load_conf" at the end of load_conf_from_db()
not usable for the first call in common.inc.php (plugins not loaded)
git-svn-id: http://piwigo.org/svn/trunk@23372 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/functions.inc.php | 2 | ||||
| -rw-r--r-- | tools/triggers_list.php | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index 9d8bfa923..027299e66 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1020,6 +1020,8 @@ SELECT param, value } $conf[ $row['param'] ] = $val; } + + trigger_action('load_conf', $condition); } function conf_update_param($param, $value) diff --git a/tools/triggers_list.php b/tools/triggers_list.php index 0cb12e7a1..152e2f40e 100644 --- a/tools/triggers_list.php +++ b/tools/triggers_list.php @@ -245,6 +245,13 @@ array( 'files' => array('admin\include\functions.inc.php (invalidate_user_cache)'), ), array( + 'name' => 'load_conf', + 'type' => 'trigger_action', + 'vars' => array('string', 'condition'), + 'files' => array('include\functions.inc.php (load_conf_from_db)'), + 'infos' => 'New in 2.6. <b>Warning:</b> you can\'t trigger the first call done une common.inc.php. Use <i>init</i> instead.', +), +array( 'name' => 'list_check_integrity', 'type' => 'trigger_action', 'vars' => array('object', 'this'), |