bug 1053310

This commit is contained in:
Marc Delisle
2004-10-30 00:35:29 +00:00
parent 7bad177f30
commit 1a35c6e483
2 changed files with 2 additions and 1 deletions

View File

@@ -10,6 +10,7 @@ $Source$
* server_privileges.php (top index): MySQLi compatibility, * server_privileges.php (top index): MySQLi compatibility,
use PMA_convert_using() in case of non-latin1 user table, use PMA_convert_using() in case of non-latin1 user table,
and fix bug #1054467 (in case of BINARY User field) and fix bug #1054467 (in case of BINARY User field)
* header.inc.php: bug #1053310, undefined index under OmniSecure server
2004-10-28 Alexander M. Turek <me@derrabus.de> 2004-10-28 Alexander M. Turek <me@derrabus.de>
* user_password.php, lang/*.inc.php: Allow usage of old password hashing * user_password.php, lang/*.inc.php: Allow usage of old password hashing

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']) ? $_SERVER['HTTP_HOST'] : $GLOBALS['cfg']['SetHttpHostTitle']) . ' >> '; $title .= (empty($GLOBALS['cfg']['SetHttpHostTitle']) && isset($_SERVER['HTTP_HOST']) ? $_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']);