diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-10 18:07:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-10 18:07:11 +0200 |
| commit | 06be2ff67d5b44e2fa9e2317e63b6dc758bf301a (patch) | |
| tree | 562ec0454c28aed90687a7cbf3f9114cfcbcdeaf /phpBB/includes/functions_messenger.php | |
| parent | db9bf6da33b6f188674fa687f6f674c719afeb7c (diff) | |
| parent | bc9b813ce704a0d1a10ea259024558773ae5d54b (diff) | |
| download | forums-06be2ff67d5b44e2fa9e2317e63b6dc758bf301a.tar forums-06be2ff67d5b44e2fa9e2317e63b6dc758bf301a.tar.gz forums-06be2ff67d5b44e2fa9e2317e63b6dc758bf301a.tar.bz2 forums-06be2ff67d5b44e2fa9e2317e63b6dc758bf301a.tar.xz forums-06be2ff67d5b44e2fa9e2317e63b6dc758bf301a.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -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 4b4ee10259..bb38e96a53 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; } |