diff options
| author | Michal Čihař <michal@cihar.com> | 2016-10-04 13:16:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 13:16:06 +0300 |
| commit | 686db2039d7937e8fb869897f022eef16cd3c6d5 (patch) | |
| tree | 079209c40b91bbd3d449e9e21675cbceee80b794 /import.php | |
| parent | ddf580c51b5f7c4b6f295469b327c308863c2509 (diff) | |
| parent | e2bd783f579e9b71b9c6d192ac207e7043b1d519 (diff) | |
Merge pull request #12582 from devenbansod/fix_12569
Use Response instead of Message's display method to print error
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 127d6e6292..fe6f00d36d 100644 --- a/import.php +++ b/import.php @@ -199,7 +199,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 } |