diff options
| author | Michal Čihař <michal@cihar.com> | 2016-08-01 12:06:57 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-08-01 12:06:57 +0300 |
| commit | d621855169f7ac97c1250c7982be8c160ae056ef (patch) | |
| tree | e708061d12b984d92c26bb2cfe48430e517aa491 /import.php | |
| parent | 1f595e37e0f68c98034a0d13787787607d5f74f1 (diff) | |
| parent | aecf9de8faacf2c0b02aa14f3b5558c2fa086b10 (diff) | |
Merge branch 'QA_4_6' into QA_4_6-security
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 0e752c7851..5afdd869b4 100644 --- a/import.php +++ b/import.php @@ -756,10 +756,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? @@ -788,11 +792,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 |