diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-10 18:06:55 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-10 18:06:55 +0200 |
| commit | bc9b813ce704a0d1a10ea259024558773ae5d54b (patch) | |
| tree | 8f32e9c9dfbad53d4a81a5babdc49bed9552d697 /phpBB/includes | |
| parent | 2a5eca0391fc45a82224887bfb081dabd1b331da (diff) | |
| parent | 838d4dc2c65e3e273b46cab314e9b50b441e2f2c (diff) | |
| download | forums-bc9b813ce704a0d1a10ea259024558773ae5d54b.tar forums-bc9b813ce704a0d1a10ea259024558773ae5d54b.tar.gz forums-bc9b813ce704a0d1a10ea259024558773ae5d54b.tar.bz2 forums-bc9b813ce704a0d1a10ea259024558773ae5d54b.tar.xz forums-bc9b813ce704a0d1a10ea259024558773ae5d54b.zip | |
Merge pull request #2864 from rxu/ticket/12931
[ticket/12931] Fix general error on user registration
Diffstat (limited to 'phpBB/includes')
| -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; } |