nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #549570

Browse Source
This commit is contained in:
Alexander M. Turek
2002-04-27 19:52:19 +00:00
parent abca631b1a
commit 52b52a30b3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
- Patch #548696 (DB/Table titles should be links), thanks to - Patch #548696 (DB/Table titles should be links), thanks to
Ray Black <allah03@users.sourceforge.net>. Ray Black <allah03@users.sourceforge.net>.
- lines: 161-164: Undefined variable - lines: 161-164: Undefined variable
* common.lib.php3, lines 162, 163, 435-437: Fixed bug #549570
(Strange error if controluser is invalid)
2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* Documentation.html: * Documentation.html:

5
libraries/common.lib.php3
View File

@@ -159,6 +159,8 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
{ {
if (empty($GLOBALS['is_header_sent'])) { if (empty($GLOBALS['is_header_sent'])) {
// rabus: If we include header.inc.php3 here, we get a huge set of
// "Undefined variable" errors (see bug #549570)!
include('./header.inc.php3'); include('./header.inc.php3');
} }
@@ -430,6 +432,9 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
. $cfg['Server']['host'] . $server_port . $server_socket . ', ' . $cfg['Server']['host'] . $server_port . $server_socket . ', '
. $cfg['Server']['controluser'] . ', ' . $cfg['Server']['controluser'] . ', '
. $cfg['Server']['controlpass'] . ')'; . $cfg['Server']['controlpass'] . ')';
if (empty($GLOBALS['is_header_sent'])) {
include('./header.inc.php3');
}
PMA_mysqlDie($conn_error, $local_query, FALSE); PMA_mysqlDie($conn_error, $local_query, FALSE);
} // end if } // end if
} // end if } // end if