Use rather _SERVER than GLOBALS, should fix bug #973602.

This commit is contained in:
Michal Čihař
2004-06-16 13:34:11 +00:00
parent 59a2ae4d90
commit b932c1c30b
2 changed files with 4 additions and 1 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-06-16 Michal Čihař <michal@cihar.com>
* header.inc.php: Use rather _SERVER than GLOBALS, should fix bug #973602.
2004-06-15 Marc Delisle <lem9@users.sourceforge.net> 2004-06-15 Marc Delisle <lem9@users.sourceforge.net>
* queryframe.php: undefined $cfgRelation, thanks to Michael Keck (mkkeck) * queryframe.php: undefined $cfgRelation, thanks to Michael Keck (mkkeck)
* export.php, sql.php, db_details_importdocsql.php, ldi_check.php, * export.php, sql.php, db_details_importdocsql.php, ldi_check.php,

View File

@@ -41,7 +41,7 @@ if (empty($GLOBALS['is_header_sent'])) {
*/ */
$title = ''; $title = '';
if ($cfg['ShowHttpHostTitle']) { if ($cfg['ShowHttpHostTitle']) {
$title .= (empty($GLOBALS['cfg']['SetHttpHostTitle']) ? $GLOBALS['HTTP_HOST'] : $GLOBALS['cfg']['SetHttpHostTitle']) . ' >> '; $title .= (empty($GLOBALS['cfg']['SetHttpHostTitle']) ? $_SERVER['HTTP_HOST'] : $GLOBALS['cfg']['SetHttpHostTitle']) . ' >> ';
} }
if (!empty($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['host'])) { if (!empty($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['host'])) {
$title.=str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']); $title.=str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']);