Merge branch 'master' into develop

public/src/modules/helpers.common.js

@@ -181,7 +181,6 @@ module.exports = function (utils, Benchpress, relative_path) {
 	}
 
 	function renderTopicEvents(index, sort) {
-		console.warn('[renderTopicEvents] deprecated, use a partial at partials/topic/event.tpl');
 		if (sort === 'most_votes') {
 			return '';
 		}

src/privileges/admin.js

@@ -109,8 +109,13 @@ privsAdmin.resolve = (path) => {
 		return privsAdmin.routeMap[path];
 	}
 
-	const found = Object.entries(privsAdmin.routePrefixMap).find(entry => path.startsWith(entry[0]));
+	const found = Object.entries(privsAdmin.routePrefixMap)
-	return found ? found[1] : undefined;
+		.filter(entry => path.startsWith(entry[0]))
+		.sort((entry1, entry2) => entry2[0].length - entry1[0].length);
+	if (!found.length) {
+		return undefined;
+	}
+	return found[0][1]; // [0] is path [1] is privilege
 };
 
 privsAdmin.list = async function (uid) {

src/socket.io/index.js

@@ -13,7 +13,7 @@ const logger = require('../logger');
 const plugins = require('../plugins');
 const ratelimit = require('../middleware/ratelimit');
 
-const Namespaces = {};
+const Namespaces = Object.create(null);
 
 const Sockets = module.exports;