diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 393a43e31..d084a2c36 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -17,21 +17,15 @@ if (isset($plugin_list)) { if ($GLOBALS['cfg']['Import']['ldi_local_option'] == 'auto') { $GLOBALS['cfg']['Import']['ldi_local_option'] = FALSE; - if (PMA_MYSQL_INT_VERSION < 32349) { + $result = PMA_DBI_try_query('SHOW VARIABLES LIKE \'local\\_infile\';'); + if ($result != FALSE && PMA_DBI_num_rows($result) > 0) { + $tmp = PMA_DBI_fetch_row($result); + if ($tmp[1] == 'ON') { $GLOBALS['cfg']['Import']['ldi_local_option'] = TRUE; - } - - if (PMA_MYSQL_INT_VERSION > 40003) { - $result = PMA_DBI_try_query('SHOW VARIABLES LIKE \'local\\_infile\';'); - if ($result != FALSE && PMA_DBI_num_rows($result) > 0) { - $tmp = PMA_DBI_fetch_row($result); - if ($tmp[1] == 'ON') { - $GLOBALS['cfg']['Import']['ldi_local_option'] = TRUE; - } } - PMA_DBI_free_result($result); - unset($result); } + PMA_DBI_free_result($result); + unset($result); } $plugin_list['ldi'] = array( 'text' => 'strLDI',