diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-17 21:59:23 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-17 23:12:32 +0200 |
| commit | 59cdc26fb41d2bccb6da42af86125ea7fe2af8c8 (patch) | |
| tree | 3581e8139109abb04873075717c80bea501e2ba0 /phpBB/includes | |
| parent | 809054abfd18d08cc209e7adfbe99e805276aeb7 (diff) | |
| download | forums-59cdc26fb41d2bccb6da42af86125ea7fe2af8c8.tar forums-59cdc26fb41d2bccb6da42af86125ea7fe2af8c8.tar.gz forums-59cdc26fb41d2bccb6da42af86125ea7fe2af8c8.tar.bz2 forums-59cdc26fb41d2bccb6da42af86125ea7fe2af8c8.tar.xz forums-59cdc26fb41d2bccb6da42af86125ea7fe2af8c8.zip | |
[ticket/8558] Use only one variable and improve explain string
PHPBB3-8558
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index ddbceae4de..73604d591b 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -484,28 +484,16 @@ class messenger $use_queue = true; } + $board_contact = (($config['board_contact_name']) ? '"' . mail_encode($config['board_contact_name']) . '" ' : '') . '<' . $config['board_contact'] . '>'; + if (empty($this->replyto)) { - if ($config['board_contact_name']) - { - $this->replyto = '"' . mail_encode($config['board_contact_name']) . '" <' . $config['board_contact'] . '>'; - } - else - { - $this->replyto = '<' . $config['board_contact'] . '>'; - } + $this->replyto = $board_contact; } if (empty($this->from)) { - if ($config['board_contact_name']) - { - $this->from = '"' . mail_encode($config['board_contact_name']) . '" <' . $config['board_contact'] . '>'; - } - else - { - $this->from = '<' . $config['board_contact'] . '>'; - } + $this->from = $board_contact; } $encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol; |