diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-02 15:52:43 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-02 15:52:43 +0100 |
| commit | b432f33b49e142cadc3643c4255192d4c10cc14c (patch) | |
| tree | dcdbae6212cfd2726618b3b2c49337cc205cabb0 | |
| parent | 8e100f000ed5f67f329e597851d81652b4055a53 (diff) | |
| parent | 60c9ee068e5a4345a3906048551a7d04ecda641e (diff) | |
| download | forums-b432f33b49e142cadc3643c4255192d4c10cc14c.tar forums-b432f33b49e142cadc3643c4255192d4c10cc14c.tar.gz forums-b432f33b49e142cadc3643c4255192d4c10cc14c.tar.bz2 forums-b432f33b49e142cadc3643c4255192d4c10cc14c.tar.xz forums-b432f33b49e142cadc3643c4255192d4c10cc14c.zip | |
Merge pull request #4154 from Nicofuma/ticket/14444
[ticket/14444] Fix fatal error in functions_messenger.php
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 0aee9dd3cf..b306b9aa79 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1733,7 +1733,7 @@ function mail_encode($str, $eol = "\r\n") */ function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg) { - global $phpbb_root_path, $phpEx; + global $config, $phpbb_root_path, $phpEx; // We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used... // Reference: http://bugs.php.net/bug.php?id=15841 |