From c8ea274198a9895f1b2c8e24dc2d5e5347b86294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 16 Jun 2003 08:20:58 +0000 Subject: [PATCH] Use $cfg['DefaultTabServer'] (bug #754260). --- ChangeLog | 3 +++ index.php3 | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f90367adf..b9b2c4ab5 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-06-16 Michal Cihar + * index.php3: Use $cfg['DefaultTabServer'] (bug #754260). + 2003-06-14 Michal Cihar * export.php3: Fixed saving compressed dumps on server. * libraries/display_export.lib.php3: Fixed description for line diff --git a/index.php3 b/index.php3 index 6aee2ffda..30b5eb18e 100755 --- a/index.php3 +++ b/index.php3 @@ -74,7 +74,7 @@ if ($cfg['QueryFrame']) { echo ' document.writeln(\' \');' . "\n"; echo ' document.writeln(\' \');' . "\n"; echo ' document.writeln(\' \');' . "\n"; - echo ' document.writeln(\' \');' . "\n"; + echo ' document.writeln(\' \');' . "\n"; echo ' document.writeln(\' \');' . "\n"; echo ' document.writeln(\' <body bgcolor="#FFFFFF">\');' . "\n"; echo ' document.writeln(\' <p>' . str_replace("'", "\'", $strNoFrames) . '</p>\');' . "\n"; @@ -92,13 +92,13 @@ if ($cfg['QueryFrame']) { echo ' <frame src="left.php3?' . $url_query . '&hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n"; echo ' <frame src="queryframe.php3?' . $url_query . '&hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" />' . "\n"; echo ' </frameset>' . "\n"; - echo ' <frame src="' . (empty($db) ? 'main.php3' : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" />' . "\n"; + echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" />' . "\n"; } else { echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">' . "\n"; echo ' <frame src="left.php3?' . $url_query . '&hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n"; - echo ' <frame src="' . (empty($db) ? 'main.php3' : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="1" />' . "\n"; + echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="1" />' . "\n"; } ?>