aboutsummaryrefslogtreecommitdiffstats
path: root/tools/triggers_list.php
diff options
context:
space:
mode:
Diffstat (limited to 'tools/triggers_list.php')
-rw-r--r--tools/triggers_list.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/triggers_list.php b/tools/triggers_list.php
index e9ec6eb3c..513eddd02 100644
--- a/tools/triggers_list.php
+++ b/tools/triggers_list.php
@@ -41,7 +41,7 @@ array(
array(
'name' => 'combined_css',
'type' => 'trigger_event',
- 'vars' => array('string', 'href', 'int', 'file_ver0', 'int', 'file_ver1'),
+ 'vars' => array('string', 'href', 'Combinable', '$combinable'),
'files' => array('include\template.class.php (Template::flush)'),
),
array(
@@ -802,6 +802,13 @@ array(
'files' => array('include\functions_user.inc.php (try_log_user)'),
'infos' => 'New in 2.5. Used by identification form to check user credentials and log user. If <i>success</i> is <i>true</i>, another login method already succeed. Return <i>true</i> if your method succeed.',
),
+array(
+ 'name' => 'combinable_preparse',
+ 'type' => 'trigger_action',
+ 'vars' => array('Template', 'template', 'Combinable', '$combinable', 'FileCombiner', '$combiner'),
+ 'files' => array('include\template.class.php (FileCombiner::process_combinable)'),
+ 'infos' => 'New in 2.6.',
+),
);
?>
<!DOCTYPE html>