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

Improve compatibility modes function, thanks to Sebastian.

Browse Source
This commit is contained in:
Michal Čihař
2006-02-22 11:49:44 +00:00
parent ab26da2418
commit 30bbf58924
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/database_interface.lib.php
View File

@@ -1025,10 +1025,10 @@ function PMA_DBI_get_default_engine()
* *
* @return array supported SQL compatibility modes * @return array supported SQL compatibility modes
*/ */
function PMA_DBI_get_compatibilities() function PMA_DBI_getCompatibilities()
{ {
if (PMA_MYSQL_INT_VERSION < 40100) { if (PMA_MYSQL_INT_VERSION < 40100) {
return null; return array();
} }
$compats = array('NONE'); $compats = array('NONE');
if (PMA_MYSQL_INT_VERSION >= 40101) { if (PMA_MYSQL_INT_VERSION >= 40101) {
@@ -1040,7 +1040,7 @@ function PMA_DBI_get_compatibilities()
$compats[] = 'MSSQL'; $compats[] = 'MSSQL';
$compats[] = 'ORACLE'; $compats[] = 'ORACLE';
$compats[] = 'POSTGRESQL'; $compats[] = 'POSTGRESQL';
if (PMA_MYSQL_INT_VERSION >= 50001) { if (PMA_MYSQL_INT_VERSION >= 50002) {
$compats[] = 'TRADITIONAL'; $compats[] = 'TRADITIONAL';
} }
} }

5
libraries/display_export.lib.php
View File

@@ -287,8 +287,9 @@ function show_checked_option() {
<?php echo $strDisableForeignChecks; ?></label> <?php echo $strDisableForeignChecks; ?></label>
</div> </div>
<?php <?php
$compats = PMA_DBI_get_compatibilities(); $compats = PMA_DBI_getCompatibilities();
if (!is_null($compats)) { ?> if (count($compats) > 0) {
?>
<label for="select_sql_compat"> <label for="select_sql_compat">
<?php echo $strSQLExportCompatibility; ?>:</label> <?php echo $strSQLExportCompatibility; ?>:</label>
<select name="sql_compat" id="select_sql_compat"> <select name="sql_compat" id="select_sql_compat">

4
libraries/import/sql.php
View File

@@ -10,8 +10,8 @@ if (isset($plugin_list)) {
'extension' => 'sql', 'extension' => 'sql',
'options_text' => 'strSQLImportOptions', 'options_text' => 'strSQLImportOptions',
); );
$compats = PMA_DBI_get_compatibilities(); $compats = PMA_DBI_getCompatibilities();
if (!is_null($compats)) { if (count($compats) > 0) {
$values = array(); $values = array();
foreach($compats as $val) { foreach($compats as $val) {
$values[$val] = $val; $values[$val] = $val;