Node.js based forum software built for the modern web
fix: closes #14133, don't modify displayName for system groups
Barış Soner Uşaklıaf0e3d96898e
diff --git a/install/package.json b/install/package.jsonindex 42a5dda294..01011ea150 100644--- a/install/package.json+++ b/install/package.json@@ -108,10 +108,10 @@"nodebb-plugin-spam-be-gone": "2.3.2","nodebb-plugin-web-push": "0.7.7","nodebb-rewards-essentials": "1.0.2",- "nodebb-theme-harmony": "2.2.62",+ "nodebb-theme-harmony": "2.2.63","nodebb-theme-lavender": "7.1.21",- "nodebb-theme-peace": "2.2.57",- "nodebb-theme-persona": "14.2.33",+ "nodebb-theme-peace": "2.2.58",+ "nodebb-theme-persona": "14.2.34","nodebb-widget-essentials": "7.0.43","nodemailer": "8.0.3","nprogress": "0.2.0",diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.jsindex 4893cea2fd..94a2d25307 100644--- a/public/src/modules/helpers.common.js+++ b/public/src/modules/helpers.common.js@@ -17,6 +17,7 @@ module.exports = function (utils, Benchpress, relative_path) {generateCategoryBackground,generateChildrenCategories,generateTopicClass,+ generateGroupDisplayName,membershipBtn,spawnPrivilegeStates,localeToHTML,@@ -167,6 +168,10 @@ module.exports = function (utils, Benchpress, relative_path) {return fields.filter(field => !!topic[field]).join(' ');}+ function generateGroupDisplayName(group) {+ return group.system ? group.displayName.replace(/-/g, ' ') : group.displayName;+ }+// Groups helpersfunction membershipBtn(groupObj, btnClass = '') {if (groupObj.isMember && groupObj.name !== 'administrators') {diff --git a/src/groups/data.js b/src/groups/data.jsindex bef4d82fec..e585b653b5 100644--- a/src/groups/data.js+++ b/src/groups/data.js@@ -133,9 +133,6 @@ module.exports = function (Groups) {if (hasField('name')) {group.nameEncoded = encodeURIComponent(group.name);group.displayName = validator.escape(String(group.name));- if (Groups.systemGroups.includes(group.name)) {- group.displayName = group.displayName.replace(/-/g, ' ');- }}if (hasField('description')) {group.description = validator.escape(String(group.description || ''));