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

bug #1544692, version 2.8.2.3 breaks setup.php

Browse Source
This commit is contained in:
Marc Delisle
2006-08-22 20:14:45 +00:00
parent 75556c3aaf
commit 12adf51627
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -8,6 +8,10 @@ $Source$
2006-08-22 Marc Delisle <lem9@users.sourceforge.net> 2006-08-22 Marc Delisle <lem9@users.sourceforge.net>
* scripts/setup.php: bug #1536112, better fix (in case of * scripts/setup.php: bug #1536112, better fix (in case of
register_globals enabled), thanks to Michal register_globals enabled), thanks to Michal
### 2.8.2.3 released from MAINT_2_8_2
* scripts/setup.php: bug #1544692, version 2.8.2.3 breaks setup.php
on a server with register_globals enabled, thanks to Juergen Windkiel
### 2.8.2.4 released from MAINT_2_8_2
2006-08-21 Marc Delisle <lem9@users.sourceforge.net> 2006-08-21 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, libraries/auth/cookie.auth.lib.php: * libraries/common.lib.php, libraries/auth/cookie.auth.lib.php:

4
scripts/setup.php
View File

@@ -1808,7 +1808,7 @@ switch ($action) {
break; break;
} }
$version_local = version_to_int( $GLOBALS['PMA_Config']->get('PMA_VERSION') ); $version_local = version_to_int( $PMA_Config_Setup->get('PMA_VERSION') );
if ($version_local === FALSE) { if ($version_local === FALSE) {
message('error', 'Unparsable version string.'); message('error', 'Unparsable version string.');
break; break;
@@ -1833,7 +1833,7 @@ switch ($action) {
case '': case '':
message('notice', 'You want to configure phpMyAdmin using web interface. Please note that this only allows basic setup, please read <a href="../Documentation.html#config">documentation</a> to see full description of all configuration directives.', 'Welcome'); message('notice', 'You want to configure phpMyAdmin using web interface. Please note that this only allows basic setup, please read <a href="../Documentation.html#config">documentation</a> to see full description of all configuration directives.', 'Welcome');
if ( $GLOBALS['PMA_Config']->get( 'PMA_PHP_INT_VERSION' ) < 40100) { if ( $PMA_Config_Setup->get( 'PMA_PHP_INT_VERSION' ) < 40100) {
message('warning', 'Please upgrade to PHP 4.1.0, it is required for phpMyAdmin.', 'Too old PHP'); message('warning', 'Please upgrade to PHP 4.1.0, it is required for phpMyAdmin.', 'Too old PHP');
} }