From 3eaf04827e75f7f578270fdcd32a4be2dbfc2d8b Mon Sep 17 00:00:00 2001
From: Misty Release Bot <deploy@nodebb.org>
Date: Tue, 13 Jun 2023 18:50:11 +0000
Subject: [PATCH 1/4] chore: incrementing version number - v3.1.5

---
 install/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/package.json b/install/package.json
index 04991202da..0aa7e2be48 100644
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.1.4",
+    "version": "3.1.5",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",

From b0d1686185f52abadd92447a012e334dba47e155 Mon Sep 17 00:00:00 2001
From: Misty Release Bot <deploy@nodebb.org>
Date: Tue, 13 Jun 2023 18:50:11 +0000
Subject: [PATCH 2/4] chore: update changelog for v3.1.5

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02d351b80d..0cc3e7f6f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+#### v3.1.5 (2023-06-13)
+
+##### Chores
+
+*  fix persona (74174414)
+*  up themes (97ff1f11)
+*  incrementing version number - v3.1.4 (2452783c)
+*  update changelog for v3.1.4 (633dc2de)
+*  incrementing version number - v3.1.3 (3b4e9d3f)
+*  incrementing version number - v3.1.2 (40fa3489)
+*  incrementing version number - v3.1.1 (40250733)
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
+##### New Features
+
+*  add back support for req.body._csrf (67f44a32)
+
+##### Bug Fixes
+
+*  improper neutralization of user input in image wrapping code (1d1639d4)
+*  don't update edit data if edited timestamp is not available (c5cd76e7)
+*  filter null nav items (b73f307a)
+*  rimraf usage in user image delete (3256fb30)
+*  closes #11620, fix copy code when line numbers are enabled (82e26829)
+*  logins dashboard user images (8cb6ebb9)
+
+##### Refactors
+
+*  change welcome headers to be smaller (0c4870ec)
+
+##### Tests
+
+*  remove socket.io test (24ebb153)
+
 #### v3.1.4 (2023-05-18)
 
 ##### Chores

From a757716ddd520e608f6e1d973dabd49b344d033a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 13 Jun 2023 16:08:59 -0400
Subject: [PATCH 3/4] fix: closes #11708, fix quick reply check

---
 public/src/client/topic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index da5ecae1b0..77b4ad9aa6 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -371,7 +371,7 @@ define('forum/topic', [
 	}
 
 	function setupQuickReply() {
-		if (config.enableQuickReply || config.theme.enableQuickReply) {
+		if (config.enableQuickReply || (config.theme && config.theme.enableQuickReply)) {
 			quickreply.init();
 		}
 	}

From 8620a2cd0ad4281dda10877fed5a5020d4bd7b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 15 Jun 2023 15:33:36 -0400
Subject: [PATCH 4/4] fix: #11717 prevent crash in messaging

---
 src/messaging/index.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/messaging/index.js b/src/messaging/index.js
index bc7d4ee4db..f5766f3343 100644
--- a/src/messaging/index.js
+++ b/src/messaging/index.js
@@ -111,7 +111,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
 		teasers: Promise.all(roomIds.map(async roomId => Messaging.getTeaser(uid, roomId))),
 	});
 
-	results.roomData.forEach((room, index) => {
+	await Promise.all(results.roomData.map(async (room, index) => {
 		if (room) {
 			room.users = results.users[index];
 			room.groupChat = room.hasOwnProperty('groupChat') ? room.groupChat : room.users.length > 2;
@@ -125,12 +125,9 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
 			});
 			room.users = room.users.filter(user => user && parseInt(user.uid, 10));
 			room.lastUser = room.users[0];
-
 			room.usernames = Messaging.generateUsernames(room.users, uid);
+			room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
 		}
-	});
-	await Promise.all(results.roomData.map(async (room) => {
-		room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
 	}));
 
 	results.roomData = results.roomData.filter(Boolean);