Index: core/kernel/startup.php
===================================================================
--- core/kernel/startup.php	(revision 13861)
+++ core/kernel/startup.php	(working copy)
@@ -49,7 +49,15 @@
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
-	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : $vars['Domain']);
+	if ( array_key_exists('HTTP_HOST', $_SERVER) ) {
+		// accessed from browser
+		define('SERVER_NAME', $_SERVER['HTTP_HOST']);
+	}
+	else {
+		// accessed from command line
+		define('SERVER_NAME', $vars['Domain']);
+		$_SERVER['HTTP_HOST'] = $vars['Domain'];
+	}
 
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
 	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
Index: tools/cron.php
===================================================================
--- tools/cron.php	(revision 13861)
+++ tools/cron.php	(working copy)
@@ -26,7 +26,6 @@
 	if (CMD_MODE) {
 		define('DBG_SKIP_REPORTING', 1);
 		$_SERVER['HTTP_USER_AGENT'] = 'gecko';
-		$_SERVER['HTTP_HOST'] = 'localhost';
 	}
 
 	include_once(FULL_PATH . '/core/kernel/startup.php');