Skip to content

Commit 27af64b

Browse files
committed
Prevent weird mage-messages cookie value from breaking things
1 parent edab04e commit 27af64b

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

view/frontend/templates/script/store/message-store.phtml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,23 @@ use Magento\Framework\View\Element\Template;
1919
});
2020
},
2121
getMessages() {
22-
const cookieMessages = LokiCookies.get('mage-messages') || [];
23-
if (cookieMessages && cookieMessages.length > 0) {
22+
const cookieMessages = this.getCookieMessages();
23+
if (cookieMessages.length > 0) {
2424
this.messages = [...this.messages, ...cookieMessages];
2525
LokiCookies.remove('mage-messages');
2626
}
2727

2828
return this.messages;
2929
},
30+
getCookieMessages() {
31+
const cookieMessages = LokiCookies.get('mage-messages') || [];
32+
if (!cookieMessages instanceof Array) {
33+
LokiCookies.remove('mage-messages');
34+
return [];
35+
}
36+
37+
return cookieMessages;
38+
},
3039
addMessage(type, text) {
3140
this.messages.push({type, text});
3241
},

0 commit comments

Comments
 (0)