This commit is contained in:
Marc Delisle
2002-04-25 01:21:27 +00:00
parent 1fba05320d
commit 6f0b4024d6
3 changed files with 10 additions and 10 deletions

View File

@@ -118,9 +118,9 @@ if (empty($asfile)
*/
// No download
if (empty($asfile)) {
$cfgServer_backup = $cfgServer;
$cfgServer_backup = $cfg['Server'];
include('./header.inc.php3');
$cfgServer = $cfgServer_backup;
$cfg['Server'] = $cfgServer_backup;
unset($cfgServer_backup);
echo '<div align="' . $cell_align_left . '">' . "\n";
echo ' <pre>' . "\n";
@@ -196,9 +196,9 @@ else {
. '# http://phpwizard.net/phpMyAdmin/' . $crlf
. '# http://www.phpmyadmin.net/ (download page)' . $crlf
. '#' . $crlf
. '# ' . $strHost . ': ' . $cfgServer['host'];
if (!empty($cfgServer['port'])) {
$dump_buffer .= ':' . $cfgServer['port'];
. '# ' . $strHost . ': ' . $cfg['Server']['host'];
if (!empty($cfg['Server']['port'])) {
$dump_buffer .= ':' . $cfg['Server']['port'];
}
$formatted_db_name = (isset($use_backquotes))
? PMA_backquote($db)

View File

@@ -139,7 +139,7 @@ while (list($key, $table) = each($the_tables)) {
$rel_query = 'SHOW TABLES';
$tables = @mysql_query($rel_query) or PMA_mysqlDie('', $rel_query, '', $err_url);
while($ctable = @mysql_fetch_array($tables)){
if($ctable[0] == $cfgServer['relation']){
if($ctable[0] == $cfg['Server']['relation']){
$rel_work=TRUE;
}
}
@@ -147,7 +147,7 @@ while (list($key, $table) = each($the_tables)) {
unset($res_rel);
// Find which tables are related with the current one and write it in an array
$rel_query = 'SELECT src_column,concat(dest_table,\'->\',dest_column) as rel ';
$rel_query .= 'FROM ' . PMA_backquote($cfgServer['relation']);
$rel_query .= 'FROM ' . PMA_backquote($cfg['Server']['relation']);
$rel_query .= ' WHERE src_table = \'' . urldecode($table) .'\'';
$relations = @mysql_query($rel_query) or PMA_mysqlDie('', $rel_query, '', $err_url);

View File

@@ -1233,10 +1233,10 @@ else if (PMA_MYSQL_INT_VERSION >= 32306
} // end 3.23.06 < MySQL < 3.23.22
// Referential integrity check
if (!empty($cfgServer['relation'])) {
if (!empty($cfg['Server']['relation'])) {
$local_query = 'SELECT src_column, dest_table, dest_column'
. ' FROM ' . $cfgServer['relation']
. ' FROM ' . $cfg['Server']['relation']
. ' WHERE src_table =\'' . $table . '\';';
// we need this mysql_select_db if the user has access to more than one db
@@ -1274,7 +1274,7 @@ if (!empty($cfgServer['relation'])) {
} // end if ($result)
echo "\n";
} // end if (!empty($cfgServer['relation']))
} // end if (!empty($cfg['Server']['relation']))
?>
<!-- Flushes the table -->