makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2864 from rxu/ticket/12931

Browse source 
[ticket/12931] Fix general error on user registration
This commit is contained in:
Marc Alexander 2014-08-10 18:06:55 +02:00
commit bc9b813ce7
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_messenger.php
View file

@ -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;
}