aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-10-27 23:36:45 +0200
committerMarc Alexander <admin@m-a-styles.de>2018-10-27 23:36:45 +0200
commita772949162ca1f43334de88e987f1516fe19c582 (patch)
tree2790edf1d7305adab56bd6a7106908f69f27d4fc /phpBB/includes/functions_messenger.php
parent628e5fbae674488a017400eb8a22253003fa0b9a (diff)
parent101681070b85d986d435b8387e78055932555f72 (diff)
downloadforums-a772949162ca1f43334de88e987f1516fe19c582.tar
forums-a772949162ca1f43334de88e987f1516fe19c582.tar.gz
forums-a772949162ca1f43334de88e987f1516fe19c582.tar.bz2
forums-a772949162ca1f43334de88e987f1516fe19c582.tar.xz
forums-a772949162ca1f43334de88e987f1516fe19c582.zip
Merge pull request #5363 from Elsensee/ticket/14656
[ticket/14656] Add List-Unsubscribe header to emails
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
-rw-r--r--phpBB/includes/functions_messenger.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 45195bd6bc..8723dda7ff 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -373,6 +373,12 @@ class messenger
$this->subject = (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']);
}
+ if (preg_match('#^(List-Unsubscribe:(.*?))$#m', $this->msg, $match))
+ {
+ $this->extra_headers[] = $match[1];
+ $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
+ }
+
if ($drop_header)
{
$this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));