diff --git a/ChangeLog b/ChangeLog index e2e02bd85..259457fb4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-08-22 Marc Delisle + * scripts/setup.php: bug #1536112, better fix (in case of + register_globals enabled), thanks to Michal + 2006-08-21 Marc Delisle * libraries/common.lib.php, libraries/auth/cookie.auth.lib.php: bug #1542875, Cookie auth on IIS diff --git a/scripts/setup.php b/scripts/setup.php index 4d877ab7f..79709a516 100644 --- a/scripts/setup.php +++ b/scripts/setup.php @@ -10,10 +10,12 @@ chdir('..'); require_once('./libraries/common.lib.php'); // Grab configuration defaults -$PMA_Config = new PMA_Config(); +// Do not use $PMA_Config, it interferes with the one in $_SESSION +// on servers with register_globals enabled +$PMA_Config_Setup = new PMA_Config(); // Script information -$script_info = 'phpMyAdmin ' . $PMA_Config->get('PMA_VERSION') . ' setup script by Michal Čihař '; +$script_info = 'phpMyAdmin ' . $PMA_Config_Setup->get('PMA_VERSION') . ' setup script by Michal Čihař '; $script_version = '$Id$'; // Grab action @@ -60,7 +62,7 @@ echo '' . "\n"; - phpMyAdmin <?php echo $PMA_Config->get('PMA_VERSION'); ?> setup + phpMyAdmin <?php echo $PMA_Config_Setup->get('PMA_VERSION'); ?> setup