Merge branch 'master' into develop

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

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",

public/src/client/topic.js

@@ -383,7 +383,7 @@ define('forum/topic', [
 	}
 
 	function setupQuickReply() {
-		if (config.enableQuickReply || config.theme.enableQuickReply) {
+		if (config.enableQuickReply || (config.theme && config.theme.enableQuickReply)) {
 			quickreply.init();
 		}
 	}

public/src/client/topic/events.js

@@ -142,19 +142,21 @@ define('forum/topic/events', [
 				posts.addBlockquoteEllipses(editedPostEl.parent());
 				editedPostEl.fadeIn(250);
 
-				const editData = {
+				if (data.post.edited) {
-					editor: data.editor,
+					const editData = {
-					editedISO: utils.toISOString(data.post.edited),
+						editor: data.editor,
-				};
+						editedISO: utils.toISOString(data.post.edited),
-
+					};
-				app.parseAndTranslate('partials/topic/post-editor', editData, function (html) {
+
-					editorEl.replaceWith(html);
+					app.parseAndTranslate('partials/topic/post-editor', editData, function (html) {
-					postContainer.find('[component="post/edit-indicator"]')
+						editorEl.replaceWith(html);
-						.removeClass('hidden')
+						postContainer.find('[component="post/edit-indicator"]')
-						.translateAttr('title', `[[global:edited-timestamp, ${editData.editedISO}]]`);
+							.removeClass('hidden')
-					postContainer.find('[component="post/editor"] .timeago').timeago();
+							.translateAttr('title', `[[global:edited-timestamp, ${editData.editedISO}]]`);
-					hooks.fire('action:posts.edited', data);
+						postContainer.find('[component="post/editor"] .timeago').timeago();
-				});
+						hooks.fire('action:posts.edited', data);
+					});
+				}
 			});
 		} else {
 			hooks.fire('action:posts.edited', data);

public/src/client/topic/images.js

@@ -26,8 +26,9 @@ define('forum/topic/images', [], function () {
 			const srcExt = src.split('.').slice(1).pop();
 			const altFilename = alt.split('/').pop();
 			const altExt = altFilename.split('.').slice(1).pop();
+
 			imageEl.wrap('<a href="' + src + '" ' +
-				(!srcExt && altExt ? ' download="' + altFilename + '" ' : '') +
+				(!srcExt && altExt ? ' download="' + utils.escapeHTML(altFilename) + '" ' : '') +
 				' target="_blank" rel="noopener">');
 		}
 	};