makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12931] Fix general error on user registration

Browse source 
Fix "Illegal use of $_SERVER" general error on user registration
when $config['server_name'] is not set.

PHPBB3-12931
This commit is contained in:
rxu 2014-08-10 21:17:06 +08:00
parent 472fe9fe60
commit 838d4dc2c6
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() function generate_message_id()
{ {
global $config; global $config, $request;
$domain = 'phpbb.generated'; $domain = ($config['server_name']) ?: $request->server('SERVER_NAME', 'phpbb.generated');
if ($config['server_name'])
{
$domain = $config['server_name'];
}
else if (!empty($_SERVER['SERVER_NAME']))
{
$domain = $_SERVER['SERVER_NAME'];
}
return md5(unique_id(time())) . '@' . $domain; return md5(unique_id(time())) . '@' . $domain;
} }