From fc3b787b70ba83613990860c182e9d7cc20cf1c8 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Wed, 6 Nov 2013 17:57:53 +0000 Subject: feature 2995: New email template restore get_l10n_args removed at r25357 apply changes to NBM git-svn-id: http://piwigo.org/svn/trunk@25360 68402e56-0260-453c-a942-63ccdbb3a9ee --- tools/triggers_list.php | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) (limited to 'tools') diff --git a/tools/triggers_list.php b/tools/triggers_list.php index bd57023c1..e9ec6eb3c 100644 --- a/tools/triggers_list.php +++ b/tools/triggers_list.php @@ -567,12 +567,6 @@ array( 'vars' => array('string', 'username'), 'files' => array('include\functions_user.inc.php (auto_login, try_log_user)'), ), -array( - 'name' => 'mail_group_assign_vars', - 'type' => 'trigger_event', - 'vars' => array('array', 'assign_vars'), - 'files' => array('include\functions_mail.inc.php (pwg_mail_group)'), -), array( 'name' => 'nbm_event_handler_added', 'type' => 'trigger_action', @@ -706,33 +700,15 @@ array( 'files' => array('profile.php (save_profile_from_post)'), ), array( - 'name' => 'send_mail', + 'name' => 'before_send_mail', 'type' => 'trigger_event', - 'vars' => array('bool', 'result', 'string', 'mail_to', 'string', 'mail_subject', 'string', 'mail_content', 'array', 'mail_headers'), + 'vars' => array('bool', 'result', 'mixed', 'to', 'array', 'arguments', 'PHPMailer', 'mail'), 'files' => array('include\functions_mail.inc.php (pwg_mail)'), ), array( - 'name' => 'send_mail_content', - 'type' => 'trigger_event', - 'vars' => array('string', 'content'), - 'files' => array('include\functions_mail.inc.php (pwg_mail)'), -), -array( - 'name' => 'send_mail_headers', - 'type' => 'trigger_event', - 'vars' => array('array', 'headers'), - 'files' => array('include\functions_mail.inc.php (pwg_mail)'), -), -array( - 'name' => 'send_mail_subject', - 'type' => 'trigger_event', - 'vars' => array('string', 'cvt_subject'), - 'files' => array('include\functions_mail.inc.php (pwg_mail)'), -), -array( - 'name' => 'send_mail_to', - 'type' => 'trigger_event', - 'vars' => array('string', 'to'), + 'name' => 'before_parse_mail_template', + 'type' => 'trigger_action', + 'vars' => array('string', 'cache_key', 'string', 'content_type'), 'files' => array('include\functions_mail.inc.php (pwg_mail)'), ), array( -- cgit v1.2.3