Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

2014-01-14 07:53:01 +01:00 · 2014-01-14 07:53:01 +01:00 · af63c7409d
commit af63c7409d
parent 2a5c09aa28 5fb647eb5a
1 changed files with 4 additions and 0 deletions
--- a/import.php
+++ b/import.php
@ -623,6 +623,10 @@ if ($go_sql) {
    // parse sql query
    include_once 'libraries/parse_analyze.inc.php';

+    if (isset($ajax_reload) && $ajax_reload['reload'] === true) {
+        $response = PMA_Response::getInstance();
+        $response->addJSON('ajax_reload', $ajax_reload);
+    }
    PMA_executeQueryAndSendQueryResponse(
        $analyzed_sql_results, false, $db, $table, null, $import_text, null,
        $analyzed_sql_results['is_affected'], null,