Fixed CSV import

Fixes #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-02-17 10:52:04 +01:00
parent 6895a1fc6e
commit 18f9231d74
2 changed files with 2 additions and 1 deletions

View File

@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
- issue #11923 Errors on Structure tab when user only has select access on certain columns
- issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables']
- issue #11907 Avoid displaying UPDATE query twice
- issue #11850 Fixed CSV import
4.5.5.0 (not yet released)
- issue Undefined index: is_ajax_request

View File

@ -213,7 +213,7 @@ function PMA_importRunQuery($sql = '', $full = '')
} else {
$executed_queries++;
if ($run_query && $executed_queries < 50) {
if ($run_query && $executed_queries < 50 && empty($sql)) {
$go_sql = true;
if (! $sql_query_disabled) {
$complete_query = $sql_query;