diff --git a/ChangeLog b/ChangeLog index fcddc5dd4..19d565117 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ $Source$ Marc). * libraries/common.lib.php, lang/*: Translate message that has been ignored for 2.7.0 release. + * libraries/common.lib.php: Make code more redable, default to MySQL 5.0 + documentation as it is latest stable version. 2005-11-20 Marc Delisle ### 2.7.0-rc1 released diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 5f1700c94..7a5c8c7b7 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -580,14 +580,15 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) { case 'viewable': default: if (empty($link)) $link = 'index'; - $mysql = '4.1'; - if ( ! defined( 'PMA_MYSQL_INT_VERSION' ) - || PMA_MYSQL_INT_VERSION < 50000 ) { - $mysql = '4.1'; - } elseif (PMA_MYSQL_INT_VERSION >= 50100) { - $mysql = '5.1'; - } elseif (PMA_MYSQL_INT_VERSION >= 50000) { - $mysql = '5.0'; + $mysql = '5.0'; + if (defined( 'PMA_MYSQL_INT_VERSION')) { + if (PMA_MYSQL_INT_VERSION < 50000) { + $mysql = '4.1'; + } elseif (PMA_MYSQL_INT_VERSION >= 50100) { + $mysql = '5.1'; + } elseif (PMA_MYSQL_INT_VERSION >= 50000) { + $mysql = '5.0'; + } } $url = $cfg['MySQLManualBase'] . '/' . $mysql . '/en/' . $link . '.html'; break;