diff options
| author | Michal Čihař <michal@cihar.com> | 2016-10-04 13:17:21 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-10-04 13:17:21 +0300 |
| commit | 3f0122b6f45d682d3e35b5fe672910f68d3c10bf (patch) | |
| tree | 41321adf03ed5838df8fba125b6887037faf8fde /import.php | |
| parent | 82158f4c482cc2a46689dc4ccbcf29da45430c92 (diff) | |
| parent | a7786dd93a5ce1ee6a6026864275bb5b753b87ae (diff) | |
Merge branch 'QA_4_6'
Diffstat (limited to 'import.php')
| -rw-r--r-- | import.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/import.php b/import.php index 7e58f6a7aa..779a78ee6e 100644 --- a/import.php +++ b/import.php @@ -203,7 +203,10 @@ if ($_POST == array() && $_GET == array()) { $_SESSION['Import_message']['message'] = $message->getDisplay(); $_SESSION['Import_message']['go_back_url'] = $GLOBALS['goto']; - $message->display(); + $response = PMA\libraries\Response::getInstance(); + $response->setRequestStatus(false); + $response->addJSON('message', $message); + exit; // the footer is displayed automatically } |