Merge branch 'master' into develop

install/package.json

@@ -99,7 +99,7 @@
         "multiparty": "4.2.3",
         "nconf": "0.12.1",
         "nodebb-plugin-2factor": "7.5.7",
-        "nodebb-plugin-composer-default": "10.2.43",
+        "nodebb-plugin-composer-default": "10.2.44",
         "nodebb-plugin-dbsearch": "6.2.5",
         "nodebb-plugin-emoji": "6.0.1",
         "nodebb-plugin-emoji-android": "4.1.1",

public/language/en-GB/aria.json

@@ -2,6 +2,7 @@
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
 	"user-avatar-for": "User avatar for %1",
+	"profile-page-for": "Profile page for user %1",
 	"user-watched-tags": "User watched tags",
 	"delete-upload-button": "Delete upload button",
 	"group-page-link-for": "Group page link for %1"

public/src/modules/helpers.common.js

@@ -306,7 +306,7 @@ module.exports = function (utils, Benchpress, relative_path) {
 		}
 		classNames = classNames || '';
 		const attributes = new Map([
-			['title', userObj.username],
+			['title', userObj.displayname],
 			['data-uid', userObj.uid],
 			['class', `avatar ${classNames}${rounded ? ' avatar-rounded' : ''}`],
 		]);

src/middleware/user.js

@@ -254,8 +254,12 @@ module.exports = function (middleware) {
 			if (res.locals.isAPI) {
 				req.params.userslug = lowercaseSlug;
 			} else {
+				try {
 					const newPath = req.path.replace(new RegExp(`/${req.params.userslug}`), () => `/${lowercaseSlug}`);
 					return res.redirect(`${nconf.get('relative_path')}${newPath}`);
+				} catch (err) {
+					next(err);
+				}
 			}
 		}
 

src/views/admin/dashboard.tpl

@@ -140,12 +140,12 @@
 		<div class="card">
 			<div class="card-header d-flex justify-content-between">[[admin/dashboard:popular-searches]] <a href="{config.relative_path}/admin/dashboard/searches" class="text-xs">[[admin/dashboard:view-all]]</a></div>
 			<div class="card-body">
-				<table class="table table-sm text-sm search-list">
+				<table class="table table-sm text-sm search-list w-100">
 					<tbody>
 						{{{ each popularSearches }}}
 						<tr>
-							<td>{popularSearches.value}</td>
-							<td class="text-end" style="width: 1px;">{formattedNumber(popularSearches.score)}</td>
+							<td class="w-100 text-truncate" style="max-width:1px;">{popularSearches.value}</td>
+							<td class="w-0 text-end text-nowrap">{formattedNumber(popularSearches.score)}</td>
 						</tr>
 						{{{ end }}}
 					</tbody>