diff options
| author | rxu <rxu@mail.ru> | 2014-08-10 21:17:06 +0800 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2014-08-10 21:31:08 +0800 |
| commit | 838d4dc2c65e3e273b46cab314e9b50b441e2f2c (patch) | |
| tree | 8b5b76ccd894878dad33ed3685be31c24a7707a6 | |
| parent | 472fe9fe60fc60a8f540456736e10f92b9809cd6 (diff) | |
| download | forums-838d4dc2c65e3e273b46cab314e9b50b441e2f2c.tar forums-838d4dc2c65e3e273b46cab314e9b50b441e2f2c.tar.gz forums-838d4dc2c65e3e273b46cab314e9b50b441e2f2c.tar.bz2 forums-838d4dc2c65e3e273b46cab314e9b50b441e2f2c.tar.xz forums-838d4dc2c65e3e273b46cab314e9b50b441e2f2c.zip | |
[ticket/12931] Fix general error on user registration
Fix "Illegal use of $_SERVER" general error on user registration
when $config['server_name'] is not set.
PHPBB3-12931
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 3657a89aa0..045e555d05 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -402,17 +402,9 @@ class messenger */ function generate_message_id() { - global $config; + global $config, $request; - $domain = 'phpbb.generated'; - if ($config['server_name']) - { - $domain = $config['server_name']; - } - else if (!empty($_SERVER['SERVER_NAME'])) - { - $domain = $_SERVER['SERVER_NAME']; - } + $domain = ($config['server_name']) ?: $request->server('SERVER_NAME', 'phpbb.generated'); return md5(unique_id(time())) . '@' . $domain; } |