From 0f463215659e524738debf33610182501b7c3383 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 21 Mar 2019 11:01:29 +0000 Subject: [PATCH] Fixed `undefined` showing up in setup/two errors --- ghost/admin/app/controllers/setup/two.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghost/admin/app/controllers/setup/two.js b/ghost/admin/app/controllers/setup/two.js index 2442011918..d54e8d2717 100644 --- a/ghost/admin/app/controllers/setup/two.js +++ b/ghost/admin/app/controllers/setup/two.js @@ -162,7 +162,7 @@ export default Controller.extend(ValidationEngine, { _handleSaveError(resp) { if (isInvalidError(resp)) { let [error] = resp.payload.errors; - this.set('flowErrors', `${error.message} ${error.context}`); + this.set('flowErrors', [error.message, error.context].join(' ')); } else { this.notifications.showAPIError(resp, {key: 'setup.blog-details'}); } @@ -171,7 +171,7 @@ export default Controller.extend(ValidationEngine, { _handleAuthenticationError(error) { if (error && error.payload && error.payload.errors) { let [apiError] = error.payload.errors; - this.set('flowErrors', `${apiError.message} ${apiError.context}`); + this.set('flowErrors', [apiError.message, apiError.context].join(' ')); } else { // Connection errors don't return proper status message, only req.body this.notifications.showAlert('There was a problem on the server.', {type: 'error', key: 'setup.authenticate.failed'});