From cac6beb4acd76abaedc7d1f9f2e4816545078bbd Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 9 Feb 2016 11:26:00 -0500 Subject: [PATCH] - Fixes display of error messages --- assets/js/src/subscribers/importExport/import.js | 6 +++--- lib/Subscribers/ImportExport/Import/MailChimp.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/src/subscribers/importExport/import.js b/assets/js/src/subscribers/importExport/import.js index f3d465b0b5..8c6d87c89e 100644 --- a/assets/js/src/subscribers/importExport/import.js +++ b/assets/js/src/subscribers/importExport/import.js @@ -193,7 +193,7 @@ define( }).done(function (response) { if (response.result === false) { MailPoet.Notice.hide(); - MailPoet.Notice.error(response.error, { + MailPoet.Notice.error(response.errors, { timeout: 3000, }); jQuery('.mailpoet_mailchimp-key-status') @@ -245,7 +245,7 @@ define( } else { MailPoet.Notice.hide(); - MailPoet.Notice(response.message, { + MailPoet.Notice.error(response.errors, { timeout: 3000, }); } @@ -1082,7 +1082,7 @@ define( }).done(function (response) { MailPoet.Modal.loading(false); if (response.result === false) { - MailPoet.Notice.error(response.error, { + MailPoet.Notice.error(response.errors, { timeout: 3000, }); } else { diff --git a/lib/Subscribers/ImportExport/Import/MailChimp.php b/lib/Subscribers/ImportExport/Import/MailChimp.php index 5fff4ba7b3..6192512525 100644 --- a/lib/Subscribers/ImportExport/Import/MailChimp.php +++ b/lib/Subscribers/ImportExport/Import/MailChimp.php @@ -151,7 +151,7 @@ class MailChimp { } return array( 'result' => false, - 'error' => $errorMessage + 'errors' => array($errorMessage) ); } } \ No newline at end of file