Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'import.php')
-rw-r--r--import.php12
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