From 838d4dc2c65e3e273b46cab314e9b50b441e2f2c Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 10 Aug 2014 21:17:06 +0800
Subject: [PATCH] [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
---
 phpBB/includes/functions_messenger.php | 12 ++----------
 1 file 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;
 	}