Skip to content

Node.js based forum software built for the modern web

fix: non string messages

Barış Soner Uşaklı713069bf82a7
diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 19d9a37693..5d41e4dee0 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -38,7 +38,9 @@ define('forum/chats', [
let isAtBottom = true;
$(window).on('action:ajaxify.start', function () {
- Chats.destroyAutoComplete(chatMainWrapper.find('[component="chat/input"]'));
+ if (chatMainWrapper) {
+ Chats.destroyAutoComplete(chatMainWrapper.find('[component="chat/input"]'));
+ }
if (ajaxify.data.template.chats) {
chatModule.leaveSocketRoom(ajaxify.data.roomId);
if (ajaxify.data.publicRooms) {
diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
index 56b2524b32..45211083b7 100644
--- a/public/src/modules/alerts.js
+++ b/public/src/modules/alerts.js
@@ -5,11 +5,11 @@ import * as hooks from './hooks';
export function alert(params) {
params.alert_id = 'alert_button_' + (params.alert_id ? params.alert_id : new Date().getTime());
- params.title = params.title ? params.title.trim() || '' : '';
- params.message = params.message ? params.message.trim() : '';
+ params.title = params.title ? String(params.title).trim() || '' : '';
+ params.message = params.message ? String(params.message).trim() : '';
params.type = params.type || 'info';
- const alert = $('#' + params.alert_id);
+ const alert = $(`#${params.alert_id}`);
if (alert.length) {
updateAlert(alert, params);
} else {
@@ -48,7 +48,7 @@ export function warning(message, timeout) {
}
export function error(message, timeout) {
- message = (message && message.message) || message;
+ message = (message && message.message) || String(message);
if (message === '[[error:revalidate-failure]]') {
socket.disconnect();