diff options
| author | Michal Čihař <michal@cihar.com> | 2016-08-01 12:05:39 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-08-01 12:05:39 +0300 |
| commit | 3bcd45f87f64330f890e5cd5e22c39cdcd419ea6 (patch) | |
| tree | 7807c3e91958c7e8e9307a47d30423128cb1eb60 /import.php | |
| parent | 257a74e116d44e5ede4d69e9b108721d62933cb4 (diff) | |
| parent | 2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee (diff) | |
Merge commit '2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee'
Diffstat (limited to 'import.php')
| -rw-r--r-- | import.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/import.php b/import.php index 5425dcc287..39db9643a6 100644 --- a/import.php +++ b/import.php @@ -636,10 +636,14 @@ if ($sqlLength <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { list( $analyzed_sql_results, $db, - $table + $table_from_sql ) = PMA_parseAnalyze($sql_query, $db); // @todo: possibly refactor extract($analyzed_sql_results); + + if ($table != $table_from_sql && !empty($table_from_sql)) { + $table = $table_from_sql; + } } // There was an error? @@ -668,11 +672,15 @@ if ($go_sql) { list( $analyzed_sql_results, $db, - $table + $table_from_sql ) = PMA_parseAnalyze($sql_query, $db); // @todo: possibly refactor extract($analyzed_sql_results); + if ($table != $table_from_sql && !empty($table_from_sql)) { + $table = $table_from_sql; + } + $html_output .= PMA_executeQueryAndGetQueryResponse( $analyzed_sql_results, // analyzed_sql_results false, // is_gotofile |