diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-20 15:23:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-20 15:23:20 +0100 |
| commit | 453d9113f1f955dc5e948f62dc73dcef81283732 (patch) | |
| tree | dc48bfd2ec27af881f1c627cca85efe366ab8b3a /phpBB/includes | |
| parent | c3108d44cee610fc6d1d397a6e6ce6e571829353 (diff) | |
| parent | dbd9c1f242ae7c7660feddf2677d41aa82bd21b4 (diff) | |
| download | forums-453d9113f1f955dc5e948f62dc73dcef81283732.tar forums-453d9113f1f955dc5e948f62dc73dcef81283732.tar.gz forums-453d9113f1f955dc5e948f62dc73dcef81283732.tar.bz2 forums-453d9113f1f955dc5e948f62dc73dcef81283732.tar.xz forums-453d9113f1f955dc5e948f62dc73dcef81283732.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 0056cbca35..526e18528f 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -431,7 +431,7 @@ class messenger */ function build_header($to, $cc, $bcc) { - global $config; + global $config, $phpbb_dispatcher; // We could use keys here, but we won't do this for 3.0.x to retain backwards compatibility $headers = array(); @@ -463,6 +463,16 @@ class messenger $headers[] = 'X-MimeOLE: phpBB3'; $headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url()); + /** + * Event to modify email header entries + * + * @event core.modify_email_headers + * @var array headers Array containing email header entries + * @since 3.1.11-RC1 + */ + $vars = array('headers'); + extract($phpbb_dispatcher->trigger_event('core.modify_email_headers', compact($vars))); + if (sizeof($this->extra_headers)) { $headers = array_merge($headers, $this->extra_headers); |