diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-02 23:00:48 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-02 23:00:48 +0100 |
| commit | f31d12ddf2905ae84a44b74ad9dedda059de4c3a (patch) | |
| tree | 94a54ae4047785c5651f570561d948f841cda668 /phpBB/includes/acp/acp_email.php | |
| parent | 8569e1c77ad1d680e11ee5387a78ca6bc5b44935 (diff) | |
| parent | 7254a52812c8cda2f76caa969cb4ff7720d85253 (diff) | |
| download | forums-f31d12ddf2905ae84a44b74ad9dedda059de4c3a.tar forums-f31d12ddf2905ae84a44b74ad9dedda059de4c3a.tar.gz forums-f31d12ddf2905ae84a44b74ad9dedda059de4c3a.tar.bz2 forums-f31d12ddf2905ae84a44b74ad9dedda059de4c3a.tar.xz forums-f31d12ddf2905ae84a44b74ad9dedda059de4c3a.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 0025e10ea2..d67999ab45 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -314,7 +314,7 @@ class acp_email $s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>'; $s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>'; - $template->assign_vars(array( + $template_data = array( 'S_WARNING' => (sizeof($error)) ? true : false, 'WARNING_MSG' => (sizeof($error)) ? implode('<br />', $error) : '', 'U_ACTION' => $this->u_action, @@ -323,8 +323,22 @@ class acp_email 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_email&field=usernames'), 'SUBJECT' => $subject, 'MESSAGE' => $message, - 'S_PRIORITY_OPTIONS' => $s_priority_options) + 'S_PRIORITY_OPTIONS' => $s_priority_options, ); + /** + * Modify custom email template data before we display the form + * + * @event core.acp_email_display + * @var array template_data Array with template data assigned to email template + * @var array exclude Array with groups which are excluded from group selection + * @var array usernames Usernames which will be displayed in form + * + * @since 3.1.4-RC1 + */ + $vars = array('template_data', 'exclude', 'usernames'); + extract($phpbb_dispatcher->trigger_event('core.acp_email_display', compact($vars))); + + $template->assign_vars($template_data); } } |